liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Chengliang 2024-10-25 15:09:39 +08:00
parent 77b2d12efd fdf4736e34
commit 8de60788a7
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/entity/department/bo/DepartmentBO.java
View File

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

2
src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
View File

@ -1280,7 +1280,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
case BROWSER://浏览按钮 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; break;
case INPUTNUMBER:// 数字 case INPUTNUMBER:// 数字

4
src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java
View File

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

8
src/com/engine/organization/util/tree/SearchTreeUtil.java
View File

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