Merge pull request '列定制BUG修复' (#146) from danikor into develop

Reviewed-on: #146

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

@@ -63,6 +63,8 @@ public interface HrmResourceMapper {
 
     SearchTemplatePO getCustomTemplateByName(@Param("userId") Integer userId, @Param("name") String name);
 
+    SearchTemplatePO getUsedCustomTemplateByUser(@Param("userId") Integer userId);
+
     Integer insertSearchTemplate(SearchTemplatePO templatePO);
 
     Integer deleteSearchTemplate(@Param("id") Integer Id, @Param("userId") Integer userId);
@@ -71,9 +73,9 @@ public interface HrmResourceMapper {
 
     Integer deleteCustomTemplate(@Param("id") Integer Id, @Param("userId") Integer userId);
 
-    List<JSONObject> queryAllResColumns(@Param("level") String level,@Param("grade") String grade);
+    List<JSONObject> queryAllResColumns(@Param("level") String level, @Param("grade") String grade);
 
-    String queryLabelName(@Param("fieldName") String fieldName,@Param("scopeId") String scopeId);
+    String queryLabelName(@Param("fieldName") String fieldName, @Param("scopeId") String scopeId);
 
 
 }

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

@@ -397,8 +397,8 @@
 
     <select id="queryAllResColumns" parameterType="java.lang.String" resultType="com.alibaba.fastjson.JSONObject">
         select a.fieldid, a.fieldname, b.labelname, a.issystem, a.ismand
-            from hrm_formfield a
-        inner join htmllabelinfo b on a.fieldlabel = b.indexid and b.languageid = 7
+        from hrm_formfield a
+                 inner join htmllabelinfo b on a.fieldlabel = b.indexid and b.languageid = 7
     </select>
     <select id="getSearchTemplateByName"
             resultType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO">
@@ -416,8 +416,12 @@
     </select>
 
     <select id="queryLabelName" parameterType="java.lang.String" resultType="java.lang.String">
-        select b.LABELNAME from hrm_formfield a inner join htmllabelinfo b on a.fieldlabel = b.indexid where a.FIELDNAME = #{fieldName} and b.LANGUAGEID  ='7'
-        union  all
+        select b.LABELNAME
+        from hrm_formfield a
+                 inner join htmllabelinfo b on a.fieldlabel = b.indexid
+        where a.FIELDNAME = #{fieldName}
+          and b.LANGUAGEID = '7'
+        union all
         SELECT t1.hrm_fieldlable as labelname
         FROM cus_formfield t1,
              cus_formdict t2
@@ -426,5 +430,12 @@
           and t1.SCOPEID = #{scopeId}
           and t2.fieldname = #{fieldName}
     </select>
+    <select id="getUsedCustomTemplateByUser"
+            resultType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO">
+        select *
+        from jcl_org_custom_template
+        where ISUSED = 1
+          and creator = #{userId}
+    </select>
 
 </mapper>

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

@@ -384,8 +384,15 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             transferOptions.add(SearchTemplateParam.builder().key(Integer.toString(idx.getAndIncrement())).showname(allCondition.getTitle()).build());
         }
         if ("-1".equals(templateId)) {
-            String selectKeys = "-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid";
-            transferKeys = Arrays.asList(selectKeys.split(","));
+            // 查询当前使用的模板，没有使用的，则展示默认模板
+            SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedCustomTemplateByUser(user.getUID());
+            if (null == usedCustomTemplate) {
+                String selectKeys = "-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid";
+                transferKeys = Arrays.asList(selectKeys.split(","));
+            } else {
+                transferKeys = getSelectKeys(usedCustomTemplate);
+                templateId = usedCustomTemplate.getId().toString();
+            }
         } else {
             SearchTemplatePO searchTemplateById = getHrmResourceMapper().getCustomTemplateById(templateId);
             transferKeys = getSelectKeys(searchTemplateById);
@@ -394,6 +401,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         resultMap.put("transferDatas", transferDatas);
         resultMap.put("transferKeys", transferKeys);
         resultMap.put("transferOptions", transferOptions);
+        resultMap.put("templateId", templateId);
 
         return resultMap;
     }