From f254feb12888454a0a3096b9a3b24e45dde2cde4 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 21 Oct 2024 15:04:06 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C-=E5=88=97?= =?UTF-8?q?=E5=AE=9A=E5=88=B6=E6=B7=BB=E5=8A=A0=E5=88=86=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/company/bo/CompBO.java | 6 +++++- .../organization/entity/company/po/CompPO.java | 14 ++++++++++++++ .../entity/department/bo/DepartmentBO.java | 1 + .../entity/searchtree/SearchTree.java | 15 +++++++++++++++ .../mapper/department/DepartmentMapper.xml | 2 ++ .../organization/util/tree/SearchTreeUtil.java | 11 +++++++++-- 6 files changed, 46 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index 240fa93a..91cc94b7 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -24,7 +24,10 @@ public class CompBO { } public static List buildSetToSearchTree(Set comps) { - return comps.stream().sorted(Comparator.comparing(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).map(item -> { + return comps.stream().sorted(Comparator + .comparing(CompPO::getShowOrder) + .thenComparing(CompPO::getShowOrderOfTree) + ).map(item -> { SearchTree tree = new SearchTree(); tree.setCanClick(true); tree.setCanceled(item.getCanceled() != null && item.getCanceled() != 0); @@ -37,6 +40,7 @@ public class CompBO { tree.setSelected(false); tree.setType("1"); tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder()); + tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0 : item.getShowOrderOfTree()); return tree; }).collect(Collectors.toList()); } diff --git a/src/com/engine/organization/entity/company/po/CompPO.java b/src/com/engine/organization/entity/company/po/CompPO.java index ae80432d..e88eb539 100644 --- a/src/com/engine/organization/entity/company/po/CompPO.java +++ b/src/com/engine/organization/entity/company/po/CompPO.java @@ -34,4 +34,18 @@ public class CompPO { private String uuid; private Integer showOrder; private Integer showOrderOfTree; + + public Integer getShowOrder() { + if (null == showOrder) { + return 0; + } + return showOrder; + } + + public Integer getShowOrderOfTree() { + if (null == showOrderOfTree) { + return 0; + } + return showOrderOfTree; + } } diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 2bc46841..dd2127e2 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -173,6 +173,7 @@ public class DepartmentBO { tree.setType("2"); tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString()); tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder().intValue()); + tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0 : item.getShowOrderOfTree()); return tree; }).collect(Collectors.toList()); } diff --git a/src/com/engine/organization/entity/searchtree/SearchTree.java b/src/com/engine/organization/entity/searchtree/SearchTree.java index 849670cf..6c3b000f 100644 --- a/src/com/engine/organization/entity/searchtree/SearchTree.java +++ b/src/com/engine/organization/entity/searchtree/SearchTree.java @@ -19,6 +19,7 @@ public class SearchTree extends TreeNode { private String requestParams; private String parentComp; private Integer orderNum; + private Integer showOrderOfTree; public String getCompanyid() { return companyid; @@ -77,6 +78,9 @@ public class SearchTree extends TreeNode { } public Integer getOrderNum() { + if(null==orderNum){ + return 0; + } return orderNum; } @@ -84,6 +88,17 @@ public class SearchTree extends TreeNode { this.orderNum = orderNum; } + public Integer getShowOrderOfTree() { + if(null==showOrderOfTree){ + return 0; + } + return showOrderOfTree; + } + + public void setShowOrderOfTree(Integer showOrderOfTree) { + this.showOrderOfTree = showOrderOfTree; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index 7d288abe..ace82766 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -12,6 +12,7 @@ + @@ -30,6 +31,7 @@ t.departmentCode, t.coadjutant, t.showOrder, + t.showOrderOfTree, t.uuid diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java index 60b7ce31..2ba24e24 100644 --- a/src/com/engine/organization/util/tree/SearchTreeUtil.java +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -91,7 +91,11 @@ public class SearchTreeUtil { Set leafIds = new HashSet<>(); List collect = treeList.stream().peek(e -> { if (null != collects && CollectionUtils.isNotEmpty(collects.get(e.getId()))) { - List nodes = collects.get(e.getId()).stream().sorted(Comparator.comparing(item -> null == item.getOrderNum() ? 0 : item.getOrderNum())).collect(Collectors.toList()); + List nodes = collects.get(e.getId()).stream().sorted(Comparator + .comparing(SearchTree::getOrderNum) + .thenComparing(SearchTree::getShowOrderOfTree) + ) + .collect(Collectors.toList()); e.setSubs(nodes); leafIds.add(e.getId()); if (CollectionUtils.isNotEmpty(e.getSubs())) { @@ -117,7 +121,10 @@ public class SearchTreeUtil { List collect = treeList.stream().peek(e -> { Set treeNodes = new LinkedHashSet<>(); if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) { - List searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList()); + List searchTrees = childMap.get(e.getId()).stream().sorted( + Comparator.comparing(SearchTree::getOrderNum) + .thenComparing(SearchTree::getShowOrderOfTree) + ).collect(Collectors.toList()); treeNodes.addAll(searchTrees); } List nodes = parentMap.get(e.getId()); -- 2.40.0.windows.1 From 95d3dac14f0e464fa9175e0739e56f46b780102c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 21 Oct 2024 15:04:06 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C-=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A0=91=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/company/bo/CompBO.java | 6 +++++- .../organization/entity/company/po/CompPO.java | 14 ++++++++++++++ .../entity/department/bo/DepartmentBO.java | 1 + .../entity/searchtree/SearchTree.java | 15 +++++++++++++++ .../mapper/department/DepartmentMapper.xml | 2 ++ .../organization/util/tree/SearchTreeUtil.java | 11 +++++++++-- 6 files changed, 46 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index 240fa93a..91cc94b7 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -24,7 +24,10 @@ public class CompBO { } public static List buildSetToSearchTree(Set comps) { - return comps.stream().sorted(Comparator.comparing(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).map(item -> { + return comps.stream().sorted(Comparator + .comparing(CompPO::getShowOrder) + .thenComparing(CompPO::getShowOrderOfTree) + ).map(item -> { SearchTree tree = new SearchTree(); tree.setCanClick(true); tree.setCanceled(item.getCanceled() != null && item.getCanceled() != 0); @@ -37,6 +40,7 @@ public class CompBO { tree.setSelected(false); tree.setType("1"); tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder()); + tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0 : item.getShowOrderOfTree()); return tree; }).collect(Collectors.toList()); } diff --git a/src/com/engine/organization/entity/company/po/CompPO.java b/src/com/engine/organization/entity/company/po/CompPO.java index ae80432d..e88eb539 100644 --- a/src/com/engine/organization/entity/company/po/CompPO.java +++ b/src/com/engine/organization/entity/company/po/CompPO.java @@ -34,4 +34,18 @@ public class CompPO { private String uuid; private Integer showOrder; private Integer showOrderOfTree; + + public Integer getShowOrder() { + if (null == showOrder) { + return 0; + } + return showOrder; + } + + public Integer getShowOrderOfTree() { + if (null == showOrderOfTree) { + return 0; + } + return showOrderOfTree; + } } diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 2bc46841..dd2127e2 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -173,6 +173,7 @@ public class DepartmentBO { tree.setType("2"); tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString()); tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder().intValue()); + tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0 : item.getShowOrderOfTree()); return tree; }).collect(Collectors.toList()); } diff --git a/src/com/engine/organization/entity/searchtree/SearchTree.java b/src/com/engine/organization/entity/searchtree/SearchTree.java index 849670cf..6c3b000f 100644 --- a/src/com/engine/organization/entity/searchtree/SearchTree.java +++ b/src/com/engine/organization/entity/searchtree/SearchTree.java @@ -19,6 +19,7 @@ public class SearchTree extends TreeNode { private String requestParams; private String parentComp; private Integer orderNum; + private Integer showOrderOfTree; public String getCompanyid() { return companyid; @@ -77,6 +78,9 @@ public class SearchTree extends TreeNode { } public Integer getOrderNum() { + if(null==orderNum){ + return 0; + } return orderNum; } @@ -84,6 +88,17 @@ public class SearchTree extends TreeNode { this.orderNum = orderNum; } + public Integer getShowOrderOfTree() { + if(null==showOrderOfTree){ + return 0; + } + return showOrderOfTree; + } + + public void setShowOrderOfTree(Integer showOrderOfTree) { + this.showOrderOfTree = showOrderOfTree; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index 7d288abe..ace82766 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -12,6 +12,7 @@ + @@ -30,6 +31,7 @@ t.departmentCode, t.coadjutant, t.showOrder, + t.showOrderOfTree, t.uuid diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java index 60b7ce31..2ba24e24 100644 --- a/src/com/engine/organization/util/tree/SearchTreeUtil.java +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -91,7 +91,11 @@ public class SearchTreeUtil { Set leafIds = new HashSet<>(); List collect = treeList.stream().peek(e -> { if (null != collects && CollectionUtils.isNotEmpty(collects.get(e.getId()))) { - List nodes = collects.get(e.getId()).stream().sorted(Comparator.comparing(item -> null == item.getOrderNum() ? 0 : item.getOrderNum())).collect(Collectors.toList()); + List nodes = collects.get(e.getId()).stream().sorted(Comparator + .comparing(SearchTree::getOrderNum) + .thenComparing(SearchTree::getShowOrderOfTree) + ) + .collect(Collectors.toList()); e.setSubs(nodes); leafIds.add(e.getId()); if (CollectionUtils.isNotEmpty(e.getSubs())) { @@ -117,7 +121,10 @@ public class SearchTreeUtil { List collect = treeList.stream().peek(e -> { Set treeNodes = new LinkedHashSet<>(); if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) { - List searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList()); + List searchTrees = childMap.get(e.getId()).stream().sorted( + Comparator.comparing(SearchTree::getOrderNum) + .thenComparing(SearchTree::getShowOrderOfTree) + ).collect(Collectors.toList()); treeNodes.addAll(searchTrees); } List nodes = parentMap.get(e.getId()); -- 2.40.0.windows.1 From 14464744b8d9dc3a2556287813a4816f36ab9720 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 26 Sep 2024 15:29:45 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=BC=96=E5=88=B6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=B5=81=E7=A8=8B=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=A4=84=E7=90=86=20=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/department/DepartmentMapper.xml | 2 +- .../service/impl/JobServiceImpl.java | 13 +- .../action/WorkflowStaffOperateAction.java | 169 ++++++++++++++++++ 3 files changed, 179 insertions(+), 5 deletions(-) create mode 100644 src/weaver/interfaces/organization/action/WorkflowStaffOperateAction.java diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index ace82766..681e4b89 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -98,7 +98,7 @@ - select max(show_order) from jcl_org_job diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index a8efd3bd..3735116a 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -367,9 +367,9 @@ public class JobServiceImpl extends Service implements JobService { } if (StringUtils.isBlank(params.get("show_order").toString())) { - Integer maxShowOrder = getJobMapper().getMaxShowOrder(); + Double maxShowOrder = getJobMapper().getMaxShowOrder(); if (null == maxShowOrder) { - maxShowOrder = 0; + maxShowOrder = 0.00; } params.put("show_order", maxShowOrder + 1); } @@ -433,8 +433,8 @@ public class JobServiceImpl extends Service implements JobService { OrganizationAssert.notBlank(department, SystemEnv.getHtmlLabelName(547423,user.getLanguage())); int insertCount = 0; List idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); - Integer orderNum = getJobMapper().getMaxShowOrder(); - orderNum = null == orderNum ? 0 : orderNum; + Double orderNum = getJobMapper().getMaxShowOrder(); + orderNum = null == orderNum ? 0.00 : orderNum; for (Long id : idList) { orderNum++; JobPO jobById = getJobMapper().getJobById(id); diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index c25bc783..632b991c 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -845,7 +845,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu jobPO.setDescription(description); jobPO.setWorkDuty(work_duty); jobPO.setWorkAuthority(work_authority); - jobPO.setShowOrder(StringUtils.isBlank(show_order) ? null : Integer.parseInt(show_order)); + jobPO.setShowOrder(StringUtils.isBlank(show_order) ? null : Double.parseDouble(show_order)); jobPO.setForbiddenTag(StringUtils.isBlank(forbidden_tag) ? null : Integer.parseInt(forbidden_tag)); jobPO.setGradeId(grade_id); jobPO.setLevelId(level_id); diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java index 2ba24e24..0b5a30b9 100644 --- a/src/com/engine/organization/util/tree/SearchTreeUtil.java +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -92,8 +92,8 @@ public class SearchTreeUtil { List collect = treeList.stream().peek(e -> { if (null != collects && CollectionUtils.isNotEmpty(collects.get(e.getId()))) { List nodes = collects.get(e.getId()).stream().sorted(Comparator - .comparing(SearchTree::getOrderNum) - .thenComparing(SearchTree::getShowOrderOfTree) + .comparingDouble(SearchTree::getOrderNum) + .thenComparingDouble(SearchTree::getShowOrderOfTree) ) .collect(Collectors.toList()); e.setSubs(nodes); @@ -122,8 +122,8 @@ public class SearchTreeUtil { Set treeNodes = new LinkedHashSet<>(); if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) { List searchTrees = childMap.get(e.getId()).stream().sorted( - Comparator.comparing(SearchTree::getOrderNum) - .thenComparing(SearchTree::getShowOrderOfTree) + Comparator.comparingDouble(SearchTree::getOrderNum) + .thenComparingDouble(SearchTree::getShowOrderOfTree) ).collect(Collectors.toList()); treeNodes.addAll(searchTrees); } -- 2.40.0.windows.1 From 918f2e2a6ea94542725e59b4917959dd1ddf69bf Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 21 Oct 2024 17:42:05 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=20?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?Double?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/api/browser/service/impl/JobBrowserService.java | 2 +- src/com/engine/organization/entity/company/bo/CompBO.java | 4 ++-- .../engine/organization/entity/company/dto/CompListDTO.java | 4 ++-- .../organization/entity/department/dto/DepartmentListDTO.java | 4 ++-- src/com/engine/organization/service/impl/CompServiceImpl.java | 4 ++-- .../organization/service/impl/DepartmentServiceImpl.java | 4 ++-- src/com/engine/organization/service/impl/JobServiceImpl.java | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index feca2a7b..5e60fd17 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -234,7 +234,7 @@ public class JobBrowserService extends BrowserService { compList = MapperProxyFactory.getProxy(CompMapper.class).listParent(); } // 获取顶层分部 - compList.stream().sorted(Comparator.comparing(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).forEach(item -> buildCompNodes(treeNodes, compHasSubs, item)); + compList.stream().sorted(Comparator.comparingDouble(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).forEach(item -> buildCompNodes(treeNodes, compHasSubs, item)); } else if ("1".equals(params.getType())) { // 当前节点下的元素 CompPO compBuild = CompPO.builder().supSubComId(Integer.parseInt(params.getId())).canceled(0).build(); diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index 91cc94b7..1e7f7d25 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -25,8 +25,8 @@ public class CompBO { public static List buildSetToSearchTree(Set comps) { return comps.stream().sorted(Comparator - .comparing(CompPO::getShowOrder) - .thenComparing(CompPO::getShowOrderOfTree) + .comparingDouble(CompPO::getShowOrder) + .thenComparingDouble(CompPO::getShowOrderOfTree) ).map(item -> { SearchTree tree = new SearchTree(); tree.setCanClick(true); diff --git a/src/com/engine/organization/entity/company/dto/CompListDTO.java b/src/com/engine/organization/entity/company/dto/CompListDTO.java index 36e3b484..a49ff720 100644 --- a/src/com/engine/organization/entity/company/dto/CompListDTO.java +++ b/src/com/engine/organization/entity/company/dto/CompListDTO.java @@ -89,9 +89,9 @@ public class CompListDTO { return children; } if ("asc".equalsIgnoreCase(orderType)) { - return children.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder)).collect(Collectors.toList()); + return children.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder)).collect(Collectors.toList()); } else { - return children.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList()); + return children.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList()); } } } diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index 45361dc8..b16a3186 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -105,9 +105,9 @@ public class DepartmentListDTO { return children; } if ("asc".equalsIgnoreCase(orderType)) { - return children.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder)).collect(Collectors.toList()); + return children.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder)).collect(Collectors.toList()); } else { - return children.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList()); + return children.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList()); } } } diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 3a9680d7..4e6b0596 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -85,10 +85,10 @@ public class CompServiceImpl extends Service implements CompService { // 添加父级元素 List compListDTOS = CompBO.buildCompDTOList(allList, filterCompPOs, orderType.toString()); if ("asc".equalsIgnoreCase(orderType.toString())) { - compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder)).collect(Collectors.toList()); + compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder)).collect(Collectors.toList()); } else { - compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList()); + compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList()); } List subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS); pageInfos = new PageInfo<>(user, subList, CompListDTO.class); diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 897d407a..7e167447 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -134,10 +134,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 添加父级元素 List compListDTOS = DepartmentBO.buildDeptDTOList(allList, filterDeptPOs, orderType.toString()); if ("asc".equalsIgnoreCase(orderType.toString())) { - compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder)).collect(Collectors.toList()); + compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder)).collect(Collectors.toList()); } else { - compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList()); + compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList()); } List subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS); pageInfos = new PageInfo<>(user, DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 3735116a..b4a23232 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -164,10 +164,10 @@ public class JobServiceImpl extends Service implements JobService { // 添加父级元素 List jobListDTOS = JobBO.buildJobDTOList(allList, filterJobPOs); if ("asc".equalsIgnoreCase(orderType.toString())) { - jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder)).collect(Collectors.toList()); + jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparingDouble(JobListDTO::getShowOrder)).collect(Collectors.toList()); } else { - jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder).reversed()).collect(Collectors.toList()); + jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparingDouble(JobListDTO::getShowOrder).reversed()).collect(Collectors.toList()); } List subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), jobListDTOS); pageInfos = new PageInfo<>(user, subList, JobListDTO.class); -- 2.40.0.windows.1