From a7b1f33e1a3b6ec79194dec4f8f1861b41274d52 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Thu, 12 Jan 2023 14:08:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=9A=E5=88=B6?=
 =?UTF-8?q?=E5=88=97=E7=A9=BF=E6=A2=AD=E6=A1=86=E6=8E=A5=E5=8F=A3=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/resource/HrmResourceMapper.xml        |  2 +-
 .../service/impl/HrmResourceServiceImpl.java     | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
index 17c13dd5..47b2b266 100644
--- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
+++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
@@ -136,7 +136,7 @@
         where id = #{id}
     </select>
     <select id="getCustomTemplatesByUser"
-            resultType="com.engine.organization.entity.hrmresource.param.SearchTemplateParam">
+            resultMap="SearchTemplateMap">
         select id,
                name,
                'false' as selected
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index c81b31fa..7f0949e7 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -235,7 +235,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         Map<String, Object> resultMap = new HashMap<>();
         String templateId = StringUtils.isNotBlank(Util.null2String(params.get("templateId"))) ? Util.null2String(params.get("templateId")) : "-1";
         List<TransferDataPO> transferDatas = new ArrayList<>();
-        List<String> transferKeys = new ArrayList<>();
+        List<String> transferKeys;
         List<SearchTemplateParam> transferOptions = new ArrayList<>();
         List<SearchConditionGroup> allConditions = getAllConditions();
         AtomicInteger idx = new AtomicInteger(0);
@@ -567,7 +567,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         String parentDeptS = jobTrees.stream().map(SearchTree::getParentComp).collect(Collectors.joining(","));
         if (!StringUtil.isEmpty(parentDeptS)) {
             // 兼容SQLServer每次最多in,2100条数据
-            List<Long> ids = (List<Long>) DeleteParam.builder().ids(parentDeptS).build().getIds();
+            List<Long> ids = DeleteParam.builder().ids(parentDeptS).build().getIds();
             int ceilCount = (int) Math.ceil((double) ids.size() / 1000);
             List<DepartmentPO> departmentsByIds = new ArrayList<>();
             for (int i = 0; i < ceilCount - 1; i++) {
@@ -858,13 +858,17 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
                 // 模糊搜索
                 break;
 
-            case INPUTNUMBER:// 数字
-            case SELECT://选择框
             case BROWSER://浏览按钮
+                // 兼容多选浏览按钮
+                sb.append(" and ").append(dbType.concat(tableSql)).append(dbType.like(value));
+                break;
+
+            case INPUTNUMBER:// 数字
             case CHECKBOX:
             case SWITCH:
                 sb.append(" and ").append(dbType.ifNull(tableSql, "0")).append(" = '").append(value).append("' ");
                 break;
+            case SELECT://选择框
             case DATE:
             case DATEPICKER:
             case TIMEPICKER:
@@ -922,11 +926,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
     private void addEmptyForSelect(SearchConditionItem searchConditionItem) {
         searchConditionItem.setValue("");
         List<SearchConditionOption> options = searchConditionItem.getOptions();
-        options.forEach(item -> {
-            item.setSelected(false);
-        });
         SearchConditionOption searchConditionOption = new SearchConditionOption();
-        searchConditionOption.setSelected(true);
         searchConditionOption.setKey("");
         options.add(0, searchConditionOption);
 

From cb814ef07752c7b911e08a97d746e803cd1ce4f8 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Thu, 12 Jan 2023 14:14:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=9A=E5=88=B6?=
 =?UTF-8?q?=E5=88=97=E7=A9=BF=E6=A2=AD=E6=A1=86=E6=8E=A5=E5=8F=A3=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/service/impl/HrmResourceServiceImpl.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index b76444f6..40278dcd 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -995,7 +995,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         SearchConditionOption searchConditionOption = new SearchConditionOption();
         searchConditionOption.setKey("");
         options.add(0, searchConditionOption);
-
+        options.forEach(item -> {
+            item.setSelected(false);
+        });
     }
 
     /**