Merge pull request 'BUG修复' (#140) from feature/dxf into develop

Reviewed-on: #140

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

@@ -57,8 +57,12 @@ public interface HrmResourceMapper {
 
     SearchTemplatePO getSearchTemplateById(@Param("id") String id);
 
+    SearchTemplatePO getSearchTemplateByName(@Param("userId") Integer userId, @Param("name") String name);
+
     SearchTemplatePO getCustomTemplateById(@Param("id") String id);
 
+    SearchTemplatePO getCustomTemplateByName(@Param("userId") Integer userId, @Param("name") String name);
+
     Integer insertSearchTemplate(SearchTemplatePO templatePO);
 
     Integer deleteSearchTemplate(@Param("id") Integer Id, @Param("userId") Integer userId);

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

@@ -384,8 +384,7 @@
     </sql>
 
     <select id="queryAllResColumns" parameterType="java.lang.String" resultType="com.alibaba.fastjson.JSONObject">
-        select
+        select a.ID,
-            a.ID ,
                a.LASTNAME,
                a.DEPARTMENTID,
                a.SUBCOMPANYID1,
@@ -403,8 +402,7 @@
                d.level_name,
                e.grade_name,
                f.sequence_name
-        from
+        from hrmresource a
-            hrmresource a
                  left join cus_fielddata b on
             a.ID = b.id
                  left join jcl_org_scheme c on
@@ -416,5 +414,19 @@
                  left join jcl_org_sequence f on
             b.field5 = f.id
     </select>
+    <select id="getSearchTemplateByName"
+            resultType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO">
+        select *
+        from jcl_org_search_template
+        where creator = #{userId}
+          and name = #{name}
+    </select>
+    <select id="getCustomTemplateByName"
+            resultType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO">
+        select *
+        from jcl_org_custom_template
+        where creator = #{userId}
+          and name = #{name}
+    </select>
 
 </mapper>

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

@@ -177,6 +177,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
     @Override
     public Integer saveSearchTemplate(SearchTemplateParam params) {
+        // 重复名称校验
+        SearchTemplatePO searchTemplateByName = getHrmResourceMapper().getSearchTemplateByName(user.getUID(), params.getShowname());
+        OrganizationAssert.isNull(searchTemplateByName, "改模板名称已存在");
         SearchTemplatePO templatePO = buildSearchTemplateByFields(params.getFields());
         if (null == templatePO) {
             return -1;
@@ -239,6 +242,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
     @Override
     public Integer saveCustomTemplate(SearchTemplateParam params) {
+        // 重复名称校验
+        SearchTemplatePO searchTemplateByName = getHrmResourceMapper().getCustomTemplateByName(user.getUID(), params.getShowname());
+        OrganizationAssert.isNull(searchTemplateByName, "改模板名称已存在");
         SearchTemplatePO templatePO = buildSearchTemplateByFields(params.getFields());
         if (null == templatePO) {
             return -1;
@@ -485,7 +491,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             Map<String, Object> resultMap = new HashMap<>();
             resultMap.put("id", item.getId());
             resultMap.put("name", item.getName());
-            resultMap.put("createTime", DateUtil.getDate(item.getCreateTime()));
+            resultMap.put("createTime", DateUtil.getDate(item.getCreateTime(), DateUtil.FORMAT_FULL));
 
             if (item.getIsused() != null) {
 
@@ -543,6 +549,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
                 continue;
             }
             String key = entry.getKey();
+            if ("lastName".equals(key)) {
+                sb.append(" and t.lastname ").append(dbType.like(value));
+            }
             SearchConditionItem searchConditionItem = allFieldsMap.get(key);
             buildDynamicSql(searchConditionItem, key, value, sb, dbType);
             // 根据不同的类型,不同的查询方式