Merge pull request '组织树 排序BUG修复' (#285) from feature/dxf into develop

Reviewed-on: #285

src/com/engine/organization/entity/department/bo/DepartmentBO.java

@@ -173,7 +173,7 @@ public class DepartmentBO {
             tree.setType("2");
             tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString());
             tree.setOrderNum(null == item.getShowOrder() ? 0.00 : item.getShowOrder().intValue());
-            tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0 : item.getShowOrderOfTree());
+            tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0.00 : item.getShowOrderOfTree());
             return tree;
         }).collect(Collectors.toList());
     }

src/com/engine/organization/service/impl/HrmResourceServiceImpl.java

@@ -1280,7 +1280,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
             case BROWSER://浏览按钮
                 // 兼容多选浏览按钮
-                sb.append(" and ").append(dbType.concat(tableSql)).append(dbType.like(value));
+                sb.append(" and ").append(dbType.concat(tableSql)).append(dbType.like("," + value + ","));
                 break;
 
             case INPUTNUMBER:// 数字

src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java

@@ -27,8 +27,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
-import weaver.hrm.cachecenter.bean.RolemembersComInfo;
-import weaver.hrm.resource.ResourceComInfo;
 import weaver.hrm.roles.RolesComInfo;
 import weaver.systeminfo.SystemEnv;
 
@@ -233,7 +231,7 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
         }
         String ecRolelevel = (String) params.get("ecRolelevel");
         if (StringUtils.isNotBlank(ecRolelevel)) {
-            sqlWhere += " AND " + dbType.concat("ec_rolelevel") + dbType.like(ecRolelevel);
+            sqlWhere += " AND " + dbType.concat("ec_rolelevel") + dbType.like("," + ecRolelevel + ",");
         }
         return sqlWhere;
     }

src/com/engine/organization/util/tree/SearchTreeUtil.java

@@ -114,7 +114,7 @@ public class SearchTreeUtil {
      * @return
      */
     public static List<SearchTree> builderTreeMode(List<SearchTree> treeList, List<SearchTree> deptTrees) {
-        Map<String, List<TreeNode>> parentMap = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid));
+        Map<String, List<SearchTree>> parentMap = treeList.stream().collect(Collectors.groupingBy(SearchTree::getPid));
         Map<String, List<SearchTree>> childMap = deptTrees.stream().collect(Collectors.groupingBy(SearchTree::getParentComp));
         boolean isAdd = !childMap.isEmpty();
         Set<String> leafIds = new HashSet<>();
@@ -127,8 +127,12 @@ public class SearchTreeUtil {
                 ).collect(Collectors.toList());
                 treeNodes.addAll(searchTrees);
             }
-            List<TreeNode> nodes = parentMap.get(e.getId());
+            List<SearchTree> nodes = parentMap.get(e.getId());
             if (CollectionUtils.isNotEmpty(nodes)) {
+                nodes = nodes.stream().sorted(
+                        Comparator.comparingDouble(SearchTree::getOrderNum)
+                                .thenComparingDouble(SearchTree::getShowOrderOfTree)
+                ).collect(Collectors.toList());
                 treeNodes.addAll(nodes);
             }
             e.setSubs(new ArrayList<>(treeNodes));