Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

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

@@ -144,7 +144,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         List<SearchConditionGroup> allConditions = getAllConditions();
 
         if (jclOrgCustomTemplatePO != null) {
+            if (StringUtils.isNotBlank(jclOrgCustomTemplatePO.getBasicFields())) {
                 columns = jclOrgCustomTemplatePO.getBasicFields();
+            }
             if (StringUtils.isNotBlank(jclOrgCustomTemplatePO.getPersonalFields())) {
                 columns = columns + "," + jclOrgCustomTemplatePO.getPersonalFields();
             }
@@ -392,6 +394,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         SearchTemplatePO templatePO = buildSearchTemplateByFields(columns);
         JclOrgCustomTemplatePO jclOrgCustomTemplatePO = new JclOrgCustomTemplatePO();
         if (StringUtils.isNotBlank(templateId)) {
+            if (templateId.equals("-1")) {
+                getJclOrgCustomTemplateMapper().updateUsed("0", null, String.valueOf(user.getUID()));
+            } else {
                 jclOrgCustomTemplatePO = getJclOrgCustomTemplateMapper().selectByPrimaryKey(Long.parseLong(templateId));
                 if (jclOrgCustomTemplatePO != null) {
                     jclOrgCustomTemplatePO.setId(Integer.valueOf(templateId));
@@ -400,11 +405,12 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
                     jclOrgCustomTemplatePO.setWorkFields(templatePO.getWorkFields());
                     jclOrgCustomTemplatePO.setIsused(1);
                     //取消已启用模板
-                getJclOrgCustomTemplateMapper().updateUsed("0", templateId, String.valueOf(user.getUID()));
+                    getJclOrgCustomTemplateMapper().updateUsed("0", null, String.valueOf(user.getUID()));
                     //启用当前模板
                     getJclOrgCustomTemplateMapper().updateByPrimaryKeySelective(jclOrgCustomTemplatePO);
                 }
             }
+        }
         return jclOrgCustomTemplatePO.getId();
     }
 
@@ -571,7 +577,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(), DateUtil.FORMAT_FULL));
+            resultMap.put("createTime", DateUtil.getDate(item.getCreateTime(), "yyyy-MM-dd"));
 
             if (item.getIsused() != null) {