Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl

src/com/engine/organization/mapper/resource/HrmResourceMapper.java

@@ -67,6 +67,8 @@ public interface HrmResourceMapper {
 
     SearchTemplatePO getUsedCustomTemplateByUser(@Param("userId") Integer userId);
 
+    SearchTemplatePO getUsedSerarchTemplateByUser(@Param("userId") Integer userId);
+
     SearchTemplatePO getOverallCustomTemplate();
 
     Integer insertSearchTemplate(SearchTemplatePO templatePO);
@@ -77,6 +79,8 @@ public interface HrmResourceMapper {
 
     Integer deleteCustomTemplate(@Param("id") Integer Id, @Param("userId") Integer userId);
 
+    Integer updateCustomTemplateUsed(@Param("userId") Integer userId);
+
 
     String queryLabelName(@Param("fieldName") String fieldName, @Param("scopeId") String scopeId, @Param("language") Integer language);
 

src/com/engine/organization/mapper/resource/HrmResourceMapper.xml

@@ -14,6 +14,9 @@
         <result column="name" property="showname"/>
         <!--        <result column="selected" property="selected"/>-->
     </resultMap>
+    <update id="updateCustomTemplateUsed">
+        update JCL_ORG_SEARCH_TEMPLATE set isused = null where creator = #{userId}
+    </update>
 
 
     <select id="selectFilterDatas" resultType="com.engine.organization.entity.hrmresource.po.ResourcePO">
@@ -183,6 +186,9 @@
             <if test="workFields != null">
                 work_fields,
             </if>
+            <if test="isused != null">
+                isused,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="creator != null">
@@ -206,6 +212,9 @@
             <if test="workFields != null">
                 #{workFields},
             </if>
+            <if test="isused != null">
+                #{isused},
+            </if>
         </trim>
     </insert>
 
@@ -479,5 +488,12 @@
         </foreach>
         order by id
     </select>
+    <select id="getUsedSerarchTemplateByUser"
+            resultType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO">
+        select *
+        from jcl_org_search_template
+        where ISUSED = 1
+        and creator = #{userId}
+    </select>
 
 </mapper>

src/com/engine/organization/service/impl/HrmResourceServiceImpl.java

@@ -273,6 +273,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         templatePO.setCreator(user.getUID());
         templatePO.setCreateTime(new Date());
         templatePO.setUpdateTime(new Date());
+        templatePO.setIsused("1");
+        // 将之前的模板，isused置为null
+        getHrmResourceMapper().updateCustomTemplateUsed(user.getUID());
         getHrmResourceMapper().insertSearchTemplate(templatePO);
         return templatePO.getId();
     }
@@ -635,6 +638,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         btnDatas.put("loginId", user.getUID());
         //获取当前用户使用的列定制模板Id
         btnDatas.put("customTemplateId", getCustomTemplateId());
+        btnDatas.put("searchTemplateId", getSearchTemplateId());
 
         return btnDatas;
     }
@@ -661,6 +665,22 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         return customTemplateId;
     }
 
+    /**
+     * 获取当前用户使用的查询模板Id
+     *
+     * @return
+     */
+    private String getSearchTemplateId() {
+
+        String searchTemplateId = "-1";
+        SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedSerarchTemplateByUser(user.getUID());
+        if (null != usedCustomTemplate) {
+            searchTemplateId = usedCustomTemplate.getId().toString();
+        }
+
+        return searchTemplateId;
+    }
+
     @Override
     public Map<String, Object> getTabForm(Map<String, Object> params) {
         Map<String, Object> apiDatas = new HashMap<>();