From 35cf5dc8f6e758998a0c0d820c567e52933ffc8c Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Thu, 19 Oct 2023 11:01:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8FBUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/company/dto/CompListDTO.java            |  4 ++++
 .../entity/department/dto/DepartmentListDTO.java   |  4 ++++
 .../organization/entity/job/dto/JobListDTO.java    |  4 ++++
 .../engine/organization/mapper/job/JobMapper.xml   |  2 +-
 .../organization/service/impl/CompServiceImpl.java |  9 ++++++++-
 .../service/impl/DepartmentServiceImpl.java        | 10 +++++++++-
 .../organization/service/impl/JobServiceImpl.java  | 14 +++++++++++---
 .../engine/organization/util/PageInfoSortUtil.java |  3 ++-
 8 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/com/engine/organization/entity/company/dto/CompListDTO.java b/src/com/engine/organization/entity/company/dto/CompListDTO.java
index 6b017273..56809ee3 100644
--- a/src/com/engine/organization/entity/company/dto/CompListDTO.java
+++ b/src/com/engine/organization/entity/company/dto/CompListDTO.java
@@ -74,4 +74,8 @@ public class CompListDTO {
      * 子节点
      */
     private List<CompListDTO> children;
+
+    public Integer getShowOrder() {
+        return null == showOrder ? 0 : showOrder;
+    }
 }
diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java
index ea3da8b4..12f4d51a 100644
--- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java
+++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java
@@ -90,4 +90,8 @@ public class DepartmentListDTO {
      * 子节点
      */
     private List<DepartmentListDTO> children;
+
+    public Double getShowOrder() {
+        return null == showOrder ? 0 : showOrder;
+    }
 }
diff --git a/src/com/engine/organization/entity/job/dto/JobListDTO.java b/src/com/engine/organization/entity/job/dto/JobListDTO.java
index 0796000c..5a27050a 100644
--- a/src/com/engine/organization/entity/job/dto/JobListDTO.java
+++ b/src/com/engine/organization/entity/job/dto/JobListDTO.java
@@ -98,4 +98,8 @@ public class JobListDTO {
      * 子节点
      */
     private List<JobListDTO> children;
+
+    public Integer getShowOrder() {
+        return null == showOrder ? 0 : showOrder;
+    }
 }
diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml
index ecd2dfdc..fdf615f2 100644
--- a/src/com/engine/organization/mapper/job/JobMapper.xml
+++ b/src/com/engine/organization/mapper/job/JobMapper.xml
@@ -516,7 +516,7 @@
         select t.id
         from jcl_org_job t
                  inner join hrmresource h on t.ec_jobtitle = h.jobtitle and t.ec_company = h.subcompanyid1 and
-                                             t.ec_department = h.departmentid and t.id = #{jobId}
+                                             t.ec_department = h.departmentid and t.id = #{jobId} and h.status &lt; 4
     </select>
     <select id="getJobByResource" resultType="com.engine.organization.entity.job.po.JobPO">
         select
diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java
index 2c7aabb4..c6d40a3f 100644
--- a/src/com/engine/organization/service/impl/CompServiceImpl.java
+++ b/src/com/engine/organization/service/impl/CompServiceImpl.java
@@ -70,7 +70,8 @@ public class CompServiceImpl extends Service implements CompService {
         CompPO companyPO = CompBO.convertParamToPO(params, user.getUID());
         boolean filter = isFilter(companyPO);
         PageInfo<CompListDTO> pageInfos;
-        String orderSql = PageInfoSortUtil.getSortSql(params.getSortParams(), " showorder ");
+        StringBuilder orderType = new StringBuilder("asc");
+        String orderSql = PageInfoSortUtil.getSortSql(orderType, params.getSortParams(), " showorder ");
         List<CompPO> allList = getCompMapper().listAll(orderSql);
 
         new DetachUtil(user).filterCompanyList(allList);
@@ -83,6 +84,12 @@ public class CompServiceImpl extends Service implements CompService {
 
             // 添加父级元素
             List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(allList, filterCompPOs);
+            if ("asc".equalsIgnoreCase(orderType.toString())) {
+                compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder)).collect(Collectors.toList());
+
+            } else {
+                compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+            }
             List<CompListDTO> subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS);
             pageInfos = new PageInfo<>(subList, CompListDTO.class);
             pageInfos.setTotal(compListDTOS.size());
diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
index 44e2e894..d73b8171 100644
--- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
+++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
@@ -131,7 +131,9 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(param, user.getUID());
         boolean filter = isFilter(departmentPO);
         PageInfo<DepartmentListDTO> pageInfos;
-        String orderSql = PageInfoSortUtil.getSortSql(param.getSortParams(), " showorder ");
+        StringBuilder orderType = new StringBuilder("asc");
+        String orderSql = PageInfoSortUtil.getSortSql(orderType, param.getSortParams(), " showorder ");
+
         List<DepartmentPO> allList = getDepartmentMapper().listAll(orderSql);
         new DetachUtil(user).filterDepartmentList(allList);
         // 通过子级遍历父级元素
@@ -141,6 +143,12 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
             new DetachUtil(user).filterDepartmentList(filterDeptPOs);
             // 添加父级元素
             List<DepartmentListDTO> compListDTOS = DepartmentBO.buildDeptDTOList(allList, filterDeptPOs);
+            if ("asc".equalsIgnoreCase(orderType.toString())) {
+                compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder)).collect(Collectors.toList());
+
+            } else {
+                compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+            }
             List<DepartmentListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS);
             pageInfos = new PageInfo<>(DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class);
             pageInfos.setTotal(compListDTOS.size());
diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java
index 167b4ac7..5332d5dd 100644
--- a/src/com/engine/organization/service/impl/JobServiceImpl.java
+++ b/src/com/engine/organization/service/impl/JobServiceImpl.java
@@ -149,7 +149,9 @@ public class JobServiceImpl extends Service implements JobService {
         JobPO jobPO = JobBO.convertParamsToPO(param, user.getUID());
         boolean filter = isFilter(jobPO);
         PageInfo<JobListDTO> pageInfos;
-        String orderSql = PageInfoSortUtil.getSortSql(param.getSortParams(), " show_order ");
+        StringBuilder orderType = new StringBuilder("asc");
+        String orderSql = PageInfoSortUtil.getSortSql(orderType, param.getSortParams(), " show_order ");
+        orderSql = orderSql.replace("showOrder", "show_order");
         List<JobListDTO> allList = getJobMapper().listNoFilter(orderSql);
         new DetachUtil(user).filterJobDTOList(allList);
         // 通过子级遍历父级元素
@@ -159,6 +161,12 @@ public class JobServiceImpl extends Service implements JobService {
             new DetachUtil(user).filterJobDTOList(allList);
             // 添加父级元素
             List<JobListDTO> jobListDTOS = JobBO.buildJobDTOList(allList, filterJobPOs);
+            if ("asc".equalsIgnoreCase(orderType.toString())) {
+                jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder)).collect(Collectors.toList());
+
+            } else {
+                jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+            }
             List<JobListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), jobListDTOS);
             pageInfos = new PageInfo<>(subList, JobListDTO.class);
             pageInfos.setTotal(jobListDTOS.size());
@@ -637,7 +645,7 @@ public class JobServiceImpl extends Service implements JobService {
      * @param departmentPO
      * @param builderDeparts
      */
-    private void buildParentDepts(DepartmentPO departmentPO, Set<DepartmentPO> builderDeparts,Map<Integer, DepartmentPO> departmentPOMap) {
+    private void buildParentDepts(DepartmentPO departmentPO, Set<DepartmentPO> builderDeparts, Map<Integer, DepartmentPO> departmentPOMap) {
         builderDeparts.add(departmentPO);
         if (SearchTreeUtil.isTop(departmentPO.getSupDepId())) {
             return;
@@ -710,7 +718,7 @@ public class JobServiceImpl extends Service implements JobService {
         new DetachUtil(user).filterCompanyList(filterComps);
         Set<DepartmentPO> builderDeparts = new HashSet<>();
         for (DepartmentPO departmentPO : filterDeparts) {
-            buildParentDepts(departmentPO, builderDeparts,departmentPOMap);
+            buildParentDepts(departmentPO, builderDeparts, departmentPOMap);
         }
         List<SearchTree> deptTrees = SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts));
         // 添加部门的上级分部
diff --git a/src/com/engine/organization/util/PageInfoSortUtil.java b/src/com/engine/organization/util/PageInfoSortUtil.java
index 902ba5c5..a5f39028 100644
--- a/src/com/engine/organization/util/PageInfoSortUtil.java
+++ b/src/com/engine/organization/util/PageInfoSortUtil.java
@@ -20,12 +20,13 @@ public class PageInfoSortUtil {
      * @param sortParams
      * @return
      */
-    public static String getSortSql(String sortParams, String defaultOrder) {
+    public static String getSortSql(StringBuilder orderType, String sortParams, String defaultOrder) {
         JSONArray jsonArray = JSONObject.parseArray(sortParams);
         if (CollectionUtils.isNotEmpty(jsonArray)) {
             JSONObject jsonObject = (JSONObject) jsonArray.get(0);
             String orderKey = jsonObject.getString("orderkey");
             String sortOrder = jsonObject.getString("sortOrder").replace("end", "");
+            orderType.replace(0, orderType.length(), sortOrder);
             return "t." + orderKey + " " + sortOrder;
         }
         return defaultOrder;