From 710d6f50007276dcf7a3fb55137781e6f261aa76 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Thu, 25 Jul 2024 10:55:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/service/HrmResourceService.java  |  2 +-
 .../service/impl/HrmResourceServiceImpl.java      | 15 ++++++++++-----
 .../organization/web/HrmResourceController.java   |  3 +--
 .../organization/wrapper/HrmResourceWrapper.java  |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/com/engine/organization/service/HrmResourceService.java b/src/com/engine/organization/service/HrmResourceService.java
index 6cc1178f..17aff125 100644
--- a/src/com/engine/organization/service/HrmResourceService.java
+++ b/src/com/engine/organization/service/HrmResourceService.java
@@ -133,7 +133,7 @@ public interface HrmResourceService {
      * @param params
      * @return
      */
-    Integer saveCustomTemplate(SearchTemplateParam params);
+    Map<String, Object> saveCustomTemplate(SearchTemplateParam params);
 
     /**
      * 批量修改保存定制列模板
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index c450894c..66cf0d67 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -351,14 +351,14 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
     }
 
     @Override
-    public Integer saveCustomTemplate(SearchTemplateParam params) {
+    public Map<String, Object> saveCustomTemplate(SearchTemplateParam params) {
         // 重复名称校验
+        Map<String, Object> data = new HashMap<>();
         SearchTemplatePO searchTemplateByName = getHrmResourceMapper().getCustomTemplateByName(user.getUID(), params.getShowname());
         OrganizationAssert.isFalse("默认模板".equals(params.getShowname()) || null != searchTemplateByName, SystemEnv.getHtmlLabelName(547439, user.getLanguage()));
         SearchTemplatePO templatePO = buildSearchTemplateByFields(params.getFields());
-        if (null == templatePO) {
-            return -1;
-        }
+        OrganizationAssert.notNull(templatePO,"模板存储失败");
+
         templatePO.setName(params.getShowname());
         templatePO.setCreator(user.getUID());
         templatePO.setIsused("0");
@@ -366,7 +366,12 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         templatePO.setUpdateTime(new Date());
         templatePO.setOverall(0);
         getHrmResourceMapper().insertCustomTemplate(templatePO);
-        return templatePO.getId();
+
+        Map<String, Object> param = new HashMap<>();
+        param.put("type","custom");
+        param.put("id",templatePO.getId());
+        data.put("result",getSearchTemplate(param));
+        return data;
     }
 
     @Override
diff --git a/src/com/engine/organization/web/HrmResourceController.java b/src/com/engine/organization/web/HrmResourceController.java
index c5a45b49..474778f0 100644
--- a/src/com/engine/organization/web/HrmResourceController.java
+++ b/src/com/engine/organization/web/HrmResourceController.java
@@ -286,8 +286,7 @@ public class HrmResourceController {
     public ReturnResult saveCustomTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SearchTemplateParam params) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            Integer templateId = getHrmResourceWrapper(user).saveCustomTemplate(params);
-            return ReturnResult.successed(user,Util.null2String(templateId));
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).saveCustomTemplate(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
diff --git a/src/com/engine/organization/wrapper/HrmResourceWrapper.java b/src/com/engine/organization/wrapper/HrmResourceWrapper.java
index 21145a46..2496a83a 100644
--- a/src/com/engine/organization/wrapper/HrmResourceWrapper.java
+++ b/src/com/engine/organization/wrapper/HrmResourceWrapper.java
@@ -91,7 +91,7 @@ public class HrmResourceWrapper extends OrganizationWrapper {
         return getHrmResourceService(user).getSearchTemplate(params);
     }
 
-    public Integer saveCustomTemplate(SearchTemplateParam params) {
+    public Map<String, Object> saveCustomTemplate(SearchTemplateParam params) {
         return getHrmResourceService(user).saveCustomTemplate(params);
     }