From cffa697c2f701161ad44d36166f52c3863459dc0 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 23 Oct 2024 16:39:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=91=20=E6=8E=92?= =?UTF-8?q?=E5=BA=8FBUG=E4=BF=AE=E5=A4=8D=20like=E6=90=9C=E7=B4=A2BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/department/bo/DepartmentBO.java | 2 +- .../organization/service/impl/HrmResourceServiceImpl.java | 2 +- .../service/impl/ManagerDetachServiceImpl.java | 4 +--- src/com/engine/organization/util/tree/SearchTreeUtil.java | 8 ++++++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index f3826341..1b51b49b 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/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()); } diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index d4a8d129..7903d988 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/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:// 数字 diff --git a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java index 0809ce59..99182816 100644 --- a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java +++ b/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; } diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java index 0b5a30b9..f41224b5 100644 --- a/src/com/engine/organization/util/tree/SearchTreeUtil.java +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -114,7 +114,7 @@ public class SearchTreeUtil { * @return */ public static List builderTreeMode(List treeList, List deptTrees) { - Map> parentMap = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid)); + Map> parentMap = treeList.stream().collect(Collectors.groupingBy(SearchTree::getPid)); Map> childMap = deptTrees.stream().collect(Collectors.groupingBy(SearchTree::getParentComp)); boolean isAdd = !childMap.isEmpty(); Set leafIds = new HashSet<>(); @@ -127,8 +127,12 @@ public class SearchTreeUtil { ).collect(Collectors.toList()); treeNodes.addAll(searchTrees); } - List nodes = parentMap.get(e.getId()); + List 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));