diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index bf7f66b0..f1fb7013 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -142,7 +142,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         List<SearchConditionGroup> allConditions = getAllConditions();
 
         if (jclOrgCustomTemplatePO != null) {
-            columns = jclOrgCustomTemplatePO.getBasicFields();
+            if (StringUtils.isNotBlank(jclOrgCustomTemplatePO.getBasicFields())) {
+                columns = jclOrgCustomTemplatePO.getBasicFields();
+            }
             if (StringUtils.isNotBlank(jclOrgCustomTemplatePO.getPersonalFields())) {
                 columns = columns + "," + jclOrgCustomTemplatePO.getPersonalFields();
             }
@@ -388,17 +390,21 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         SearchTemplatePO templatePO = buildSearchTemplateByFields(columns);
         JclOrgCustomTemplatePO jclOrgCustomTemplatePO = new JclOrgCustomTemplatePO();
         if (StringUtils.isNotBlank(templateId)) {
-            jclOrgCustomTemplatePO = getJclOrgCustomTemplateMapper().selectByPrimaryKey(Long.parseLong(templateId));
-            if (jclOrgCustomTemplatePO != null) {
-                jclOrgCustomTemplatePO.setId(Integer.valueOf(templateId));
-                jclOrgCustomTemplatePO.setBasicFields(templatePO.getBasicFields());
-                jclOrgCustomTemplatePO.setPersonalFields(templatePO.getPersonalFields());
-                jclOrgCustomTemplatePO.setWorkFields(templatePO.getWorkFields());
-                jclOrgCustomTemplatePO.setIsused(1);
-                //取消已启用模板
-                getJclOrgCustomTemplateMapper().updateUsed("0", templateId, String.valueOf(user.getUID()));
-                //启用当前模板
-                getJclOrgCustomTemplateMapper().updateByPrimaryKeySelective(jclOrgCustomTemplatePO);
+            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));
+                    jclOrgCustomTemplatePO.setBasicFields(templatePO.getBasicFields());
+                    jclOrgCustomTemplatePO.setPersonalFields(templatePO.getPersonalFields());
+                    jclOrgCustomTemplatePO.setWorkFields(templatePO.getWorkFields());
+                    jclOrgCustomTemplatePO.setIsused(1);
+                    //取消已启用模板
+                    getJclOrgCustomTemplateMapper().updateUsed("0", null, String.valueOf(user.getUID()));
+                    //启用当前模板
+                    getJclOrgCustomTemplateMapper().updateByPrimaryKeySelective(jclOrgCustomTemplatePO);
+                }
             }
         }
         return jclOrgCustomTemplatePO.getId();
@@ -567,7 +573,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) {