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();