src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java

@@ -55,7 +55,7 @@ public class CardAccessVO {
     @OrganizationTableColumn(text = "所有上级可见", width = "15%", column = "all_superior")
     private Integer allSuperior;
 
-    @OrganizationTableColumn(text = "查看自定义", width = "15%", column = "custom",transmethod = "com.engine.organization.transmethod.SystemTransMethod.getRoleName")
+    @OrganizationTableColumn(text = "查看自定义", width = "30%", column = "custom",transmethod = "com.engine.organization.transmethod.SystemTransMethod.getRoleName")
     private String custom;
 
 }

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

@@ -46,6 +46,14 @@ public interface HrmResourceMapper {
      */
     List<SearchTemplateParam> getSearchTemplatesByUser(@Param("userId") Integer userId);
 
+    /**
+     * 根据用户ID获取列定制模板
+     *
+     * @param userId
+     * @return
+     */
+    List<SearchTemplateParam> getCustomTemplatesByUser(@Param("userId") Integer userId);
+
     SearchTemplatePO getSearchTemplateById(@Param("id") String id);
 
     SearchTemplatePO getCustomTemplateById(@Param("id") String id);

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

@@ -135,6 +135,14 @@
         from jcl_org_custom_template
         where id = #{id}
     </select>
+    <select id="getCustomTemplatesByUser"
+            resultType="com.engine.organization.entity.hrmresource.param.SearchTemplateParam">
+        select id,
+               name,
+               'false' as selected
+        from jcl_org_custom_template
+        where creator = #{userId}
+    </select>
 
     <insert id="insertSearchTemplate" parameterType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO"
             keyProperty="id"

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

@@ -170,33 +170,44 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
     @Override
     public String getTemplateSelectKeys(Map<String, Object> params) {
-        // TODO
         String templateId = Util.null2String(params.get("templateId"));
-        String column = Util.null2String(params.get("column"));
+        templateId = StringUtils.isBlank(templateId) ? "-1" : templateId;
+        String type = Util.null2String(params.get("type"));
         OrganizationAssert.isTrue(StringUtils.isNotBlank(templateId), "数据有误，未找到对应数据");
         // 判断是否为搜索模板
-        SearchTemplatePO searchTemplateById = null;
-        if (StringUtils.isBlank(column)) {
-            searchTemplateById = getHrmResourceMapper().getSearchTemplateById(templateId);
+        SearchTemplatePO searchTemplateById;
+        List<String> selectKeys;
+        if ("custom".equals(type)) {
+            if ("-1".equals(templateId)) {
+                selectKeys = Arrays.asList("-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid".split(","));
+            } else {
+                searchTemplateById = getHrmResourceMapper().getCustomTemplateById(templateId);
+                selectKeys = getSelectKeys(searchTemplateById);
+            }
         } else {
-            searchTemplateById = getHrmResourceMapper().getCustomTemplateById(templateId);
+            if ("-1".equals(templateId)) {
+                selectKeys = getAllConditions().get(0).getItems().stream().map(item -> item.getDomkey()[0]).collect(Collectors.toList());
+            } else {
+                searchTemplateById = getHrmResourceMapper().getSearchTemplateById(templateId);
+                selectKeys = getSelectKeys(searchTemplateById);
+            }
         }
-        List<String> selectKeys = getSelectKeys(searchTemplateById);
+
         return StringUtils.join(selectKeys, ",");
     }
 
     @Override
     public List<SearchTemplateParam> getSearchTemplate(Map<String, Object> params) {
-        String templateId = StringUtils.isNotBlank(Util.null2String(params.get("templateId"))) ? Util.null2String(params.get("templateId")) : "-1";
+        String type = Util.null2String(params.get("type"));
         int userUID = user.getUID();
         // 根据ID查询所存储的模板
-        List<SearchTemplateParam> templates = getHrmResourceMapper().getSearchTemplatesByUser(userUID);
+        List<SearchTemplateParam> templates;
+        if ("custom".equals(type)) {
+            templates = getHrmResourceMapper().getCustomTemplatesByUser(userUID);
+        } else {
+            templates = getHrmResourceMapper().getSearchTemplatesByUser(userUID);
+        }
         templates.add(0, SearchTemplateParam.builder().key("-1").selected(false).showname("默认模板").build());
-        templates.forEach(item -> {
-            if (templateId.equals(item.getKey())) {
-                item.setSelected(true);
-            }
-        });
         return templates;
     }
 
@@ -237,8 +248,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             transferOptions.add(SearchTemplateParam.builder().key(Integer.toString(idx.getAndIncrement())).showname(allCondition.getTitle()).build());
         }
         if ("-1".equals(templateId)) {
-            List<SearchConditionItem> items = allConditions.get(0).getItems();
-            transferKeys = items.stream().map(item -> item.getDomkey()[0]).collect(Collectors.toList());
+            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 {
             SearchTemplatePO searchTemplateById = getHrmResourceMapper().getCustomTemplateById(templateId);
             transferKeys = getSelectKeys(searchTemplateById);