Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl

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);

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>

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++) {

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());