diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index f1fb7013..ef8f8b52 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -233,7 +233,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; @@ -298,7 +298,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; @@ -375,7 +375,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); @@ -454,7 +454,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); } @@ -623,7 +623,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)) { @@ -1099,6 +1099,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();