From 6e6c66687becd673c96c31131eb6bd2c49d6fd18 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Wed, 3 Jul 2024 18:23:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E6=A0=91?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8C=E7=BA=A7=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=B1=95=E7=A4=BA=E5=9C=A8=E5=88=86=E9=83=A8?=
 =?UTF-8?q?=E5=89=8D=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/organization/util/tree/SearchTreeUtil.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java
index b1065faa..60b7ce31 100644
--- a/src/com/engine/organization/util/tree/SearchTreeUtil.java
+++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java
@@ -116,16 +116,13 @@ public class SearchTreeUtil {
         Set<String> leafIds = new HashSet<>();
         List<SearchTree> collect = treeList.stream().peek(e -> {
             Set<TreeNode> treeNodes = new LinkedHashSet<>();
-            List<TreeNode> nodes = parentMap.get(e.getId());
-            if (CollectionUtils.isNotEmpty(nodes)) {
-                treeNodes.addAll(nodes);
-            }
             if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) {
                 List<SearchTree> searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList());
                 treeNodes.addAll(searchTrees);
             }
-            if(CollectionUtils.isNotEmpty(treeNodes)){
-                treeNodes = treeNodes.stream().sorted(Comparator.comparing(TreeNode::getType).reversed()).collect(Collectors.toCollection(LinkedHashSet::new));
+            List<TreeNode> nodes = parentMap.get(e.getId());
+            if (CollectionUtils.isNotEmpty(nodes)) {
+                treeNodes.addAll(nodes);
             }
             e.setSubs(new ArrayList<>(treeNodes));
             leafIds.add(e.getId());

From 0b0fd7293129dfe31a8b1c1becd34e2665cfa61e Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Wed, 10 Jul 2024 11:18:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AE=9A=E5=88=B6=E6=A8=A1=E6=9D=BF=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?BUB=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/resource/JclOrgCustomTemplateMapper.java         | 2 ++
 .../mapper/resource/JclOrgCustomTemplateMapper.xml          | 6 ++++++
 .../organization/service/impl/HrmResourceServiceImpl.java   | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java
index 37901863..2f71bb38 100644
--- a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java
+++ b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java
@@ -30,6 +30,8 @@ public interface JclOrgCustomTemplateMapper {
 
     List<Long> listAllId();
 
+    List<Long> listAllIdByCreator(@Param("creator") Integer creator);
+
     int deleteByIds(@Param("ids") Collection<Long> ids);
 
     int updateUsed(@Param("isused")String isused,@Param("id") String id,@Param("creator") String creator);
diff --git a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml
index fc060340..3043f7a8 100644
--- a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml
+++ b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml
@@ -147,4 +147,10 @@
         from JCL_ORG_CUSTOM_TEMPLATE t where t.isused = #{isused} and t.creator = #{creator}
     </select>
 
+    <select id="listAllIdByCreator" resultType="java.lang.Long">
+        select
+        id
+        from jcl_org_custom_template where creator = #{creator} order by id
+    </select>
+
 </mapper>
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index 0d0f18a7..1b4b8cdc 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -348,7 +348,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
     public Integer updateCustomTemplate(Map<String, Object> params) {
         int rowNum = getIntValue((String) params.get("rownum"));
         int count = 0;
-        List<Long> allIds = getJclOrgCustomTemplateMapper().listAllId();
+        // 只查询当前人员的模板数据
+        List<Long> allIds = getJclOrgCustomTemplateMapper().listAllIdByCreator(user.getUID());
         String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date());
         List<String> nameList = new ArrayList<>();
         for (int i = 0; i < rowNum; i++) {