From 0f73f6e3acfccebdb7c935fb2f4b1be3c34aed41 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 11 Jan 2023 16:28:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=9A=E5=88=B6=E5=88=97?= =?UTF-8?q?=E7=A9=BF=E6=A2=AD=E6=A1=86=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/personnelcard/vo/CardAccessVO.java | 2 +- .../mapper/resource/HrmResourceMapper.java | 8 ++++ .../mapper/resource/HrmResourceMapper.xml | 8 ++++ .../service/impl/HrmResourceServiceImpl.java | 43 ++++++++++++------- 4 files changed, 44 insertions(+), 17 deletions(-) diff --git a/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java b/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java index 934ebbeb..cdefeff7 100644 --- a/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java +++ b/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; } diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java index 164252fb..d0f3f33d 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java @@ -46,6 +46,14 @@ public interface HrmResourceMapper { */ List getSearchTemplatesByUser(@Param("userId") Integer userId); + /** + * 根据用户ID获取列定制模板 + * + * @param userId + * @return + */ + List getCustomTemplatesByUser(@Param("userId") Integer userId); + SearchTemplatePO getSearchTemplateById(@Param("id") String id); SearchTemplatePO getCustomTemplateById(@Param("id") String id); diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml index ff59d0b7..17c13dd5 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml @@ -135,6 +135,14 @@ from jcl_org_custom_template where id = #{id} + 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 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 selectKeys = getSelectKeys(searchTemplateById); + return StringUtils.join(selectKeys, ","); } @Override public List getSearchTemplate(Map 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 templates = getHrmResourceMapper().getSearchTemplatesByUser(userUID); + List 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 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); -- 2.40.0.windows.1