From 8947e6da3a1715947c35af34da667be17ccca475 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Mon, 16 Jan 2023 17:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E5=AE=9A=E5=88=B6BUG=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/service/HrmResourceService.java     |  3 +--
 .../service/impl/HrmResourceServiceImpl.java         | 12 ++++++++++--
 .../organization/wrapper/HrmResourceWrapper.java     |  3 +--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/organization/service/HrmResourceService.java b/src/com/engine/organization/service/HrmResourceService.java
index 1ee014e8..f5487042 100644
--- a/src/com/engine/organization/service/HrmResourceService.java
+++ b/src/com/engine/organization/service/HrmResourceService.java
@@ -4,7 +4,6 @@ import com.engine.organization.entity.hrmresource.param.HrmRelationSaveParam;
 import com.engine.organization.entity.hrmresource.param.SearchTemplateParam;
 import com.engine.organization.entity.searchtree.SearchTreeParams;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -126,7 +125,7 @@ public interface HrmResourceService {
      * @param params
      * @return
      */
-    List<SearchTemplateParam> getSearchTemplate(Map<String, Object> params);
+    Map<String, Object> getSearchTemplate(Map<String, Object> params);
 
     /**
      * 保存定制列模板
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index 09aaed3a..eeb5cfd8 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -284,18 +284,26 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
     }
 
     @Override
-    public List<SearchTemplateParam> getSearchTemplate(Map<String, Object> params) {
+    public Map<String, Object> getSearchTemplate(Map<String, Object> params) {
+        Map<String, Object> returnMap = new HashMap<>();
         String type = Util.null2String(params.get("type"));
         int userUID = user.getUID();
         // 根据ID查询所存储的模板
         List<SearchTemplateParam> templates;
         if ("custom".equals(type)) {
             templates = getHrmResourceMapper().getCustomTemplatesByUser(userUID);
+            SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedCustomTemplateByUser(user.getUID());
+            if (null != usedCustomTemplate) {
+                returnMap.put("templateId", usedCustomTemplate.getId());
+            } else {
+                returnMap.put("templateId", "-1");
+            }
         } else {
             templates = getHrmResourceMapper().getSearchTemplatesByUser(userUID);
         }
         templates.add(0, SearchTemplateParam.builder().key("-1").showname("默认模板").build());
-        return templates;
+        returnMap.put("templates", templates);
+        return returnMap;
     }
 
     @Override
diff --git a/src/com/engine/organization/wrapper/HrmResourceWrapper.java b/src/com/engine/organization/wrapper/HrmResourceWrapper.java
index c4760bee..37f8200b 100644
--- a/src/com/engine/organization/wrapper/HrmResourceWrapper.java
+++ b/src/com/engine/organization/wrapper/HrmResourceWrapper.java
@@ -13,7 +13,6 @@ import com.engine.organization.service.impl.HrmResourceServiceImpl;
 import com.engine.organization.util.OrganizationWrapper;
 import weaver.hrm.User;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -88,7 +87,7 @@ public class HrmResourceWrapper extends OrganizationWrapper {
         return getHrmResourceService(user).updateTabForm(params);
     }
 
-    public List<SearchTemplateParam> getSearchTemplate(Map<String, Object> params) {
+    public Map<String, Object> getSearchTemplate(Map<String, Object> params) {
         return getHrmResourceService(user).getSearchTemplate(params);
     }