From 6d8aaf063b617c6bc0750c335b47e871d668ce0d Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 13 Jan 2023 16:50:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/HrmResourceServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index bf7f66b0..3dae96c0 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -231,7 +231,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic public Integer saveSearchTemplate(SearchTemplateParam params) { // 重复名称校验 SearchTemplatePO searchTemplateByName = getHrmResourceMapper().getSearchTemplateByName(user.getUID(), params.getShowname()); - OrganizationAssert.isNull(searchTemplateByName, "该模板名称已存在"); + OrganizationAssert.isFalse("默认模板".equals(params.getShowname()) || null != searchTemplateByName, "该模板名称已存在"); SearchTemplatePO templatePO = buildSearchTemplateByFields(params.getFields()); if (null == templatePO) { return -1; @@ -296,7 +296,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic public Integer saveCustomTemplate(SearchTemplateParam params) { // 重复名称校验 SearchTemplatePO searchTemplateByName = getHrmResourceMapper().getCustomTemplateByName(user.getUID(), params.getShowname()); - OrganizationAssert.isNull(searchTemplateByName, "该模板名称已存在"); + OrganizationAssert.isFalse("默认模板".equals(params.getShowname()) || null != searchTemplateByName, "该模板名称已存在"); SearchTemplatePO templatePO = buildSearchTemplateByFields(params.getFields()); if (null == templatePO) { return -1; @@ -1093,6 +1093,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic if ("jobGroupId".equalsIgnoreCase(fieldName)) { return "t5.id"; } + // 姓名点击事件 + if ("lastname".equalsIgnoreCase(fieldName)) { + return "lastname"; + } if ("hrm".equals(tableName)) { return sb.append("t.").append(fieldName).toString(); From ec55baf5fe8a3529ea4443e8b429660b8647531b Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 13 Jan 2023 17:39:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/HrmResourceServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 3dae96c0..9583feff 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -448,7 +448,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("customization").menuIcon("icon-coms-task-list").menuName("列定制").type("BTN_COLUMN").build()); btnDatas.put("topMenu", topMenuList); rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build()); - rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("custom").menuIcon("icon-coms-task-list").menuName("显示列定制").type("BTN_COLUMN").build()); + //rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("custom").menuIcon("icon-coms-task-list").menuName("显示列定制").type("BTN_COLUMN").build()); rightMenuList.add(MenuBtn.rightMenu_btnLog()); btnDatas.put("rightMenu", rightMenuList); } @@ -617,7 +617,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic DBType dbType = DBType.get(new RecordSet().getDBType()); - StringBuilder sb = new StringBuilder(" where 1=1 "); + StringBuilder sb = new StringBuilder(" where 1=1 and t.status <4 "); for (Map.Entry entry : params.entrySet()) { String value = Util.null2String(entry.getValue()); if (StringUtils.isBlank(value)) { From 0aac4a0c57b97988b5c4980d44b65d39afa57f0f Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 13 Jan 2023 18:01:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/HrmResourceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 9583feff..6a997aee 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -373,7 +373,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic SearchTemplatePO searchTemplateById = getHrmResourceMapper().getCustomTemplateById(templateId); transferKeys = getSelectKeys(searchTemplateById); } - + transferOptions.add(0, SearchTemplateParam.builder().key("").showname("").build()); resultMap.put("transferDatas", transferDatas); resultMap.put("transferKeys", transferKeys); resultMap.put("transferOptions", transferOptions);