From 0e41f08327eca8ee4c9874bd5c8d32fd8a372b9d Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Wed, 9 Nov 2022 18:50:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BE?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=8B=E6=8B=89=E6=A1=86=E3=80=81=E9=9B=86?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=9F=E8=B4=A3=E4=BA=BABUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrgChartServiceImpl.java     | 79 +++++++++++++++----
 1 file changed, 65 insertions(+), 14 deletions(-)

diff --git a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java
index 269ed0b4..0a39f75d 100644
--- a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java
@@ -50,30 +50,30 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             item.put("companyname", rs.getString("companyname"));
             fclasslist.add(item);
         }
-        String sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype in (0, 1) order by ftype , id ";
+        String sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype in (0, 1) order by ftype , id,fdateend desc ";
 
         // 分部分权过滤
         DetachUtil detachUtil = new DetachUtil(user.getUID());
         if (detachUtil.isDETACH()) {
             String jclRoleLevels = detachUtil.getJclRoleLevels();
             if (StringUtils.isNotBlank(jclRoleLevels)) {
-                sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where (ftype = 0 or (ftype = 1 and fobjid  in(" + jclRoleLevels + "))) order by ftype , id";
+                sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where (ftype = 0 or (ftype = 1 and fobjid  in(" + jclRoleLevels + "))) order by ftype , id,fdateend desc";
             } else {
-                sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype = 0  order by ftype , id";
+                sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype = 0  order by ftype , id,fdateend desc";
             }
         }
         rs.executeQuery(sql);
-        List<Map<String, Object>> companylist = new ArrayList<>();
+        Set<OrgSelectItem> companySet = new HashSet<>();
         while (rs.next()) {
-            Map<String, Object> item = new HashMap<>();
-            item.put("id", rs.getString("id"));
-            item.put("fnumber", rs.getString("fnumber"));
-            item.put("fname", rs.getString("fname"));
-            companylist.add(item);
+            OrgSelectItem item = new OrgSelectItem();
+            item.setId(rs.getString("id"));
+            item.setFnumber(rs.getString("fnumber"));
+            item.setFname(rs.getString("fname"));
+            companySet.add(item);
         }
         result.put("api_status", true);
         result.put("fclasslist", fclasslist);
-        result.put("companylist", companylist);
+        result.put("companylist", companySet);
         return result;
     }
 
@@ -268,15 +268,22 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             item.put("fname", rs.getString("fname"));
             item.put("ftype", rs.getString("ftype"));
             item.put("parentId", null);
-            item.put("fleadername", rs.getString("fleadername"));
-            item.put("fleaderimg", rs.getString("fleaderimg"));
-            item.put("fleaderjob", rs.getString("fleaderjob"));
+            if ("0".equals(id)) {
+                item.put("fleadername", "");
+                item.put("fleaderimg", "");
+                item.put("fleaderjob", "");
+                item.put("fleader", "");
+            } else {
+                item.put("fleadername", rs.getString("fleadername"));
+                item.put("fleaderimg", rs.getString("fleaderimg"));
+                item.put("fleaderjob", rs.getString("fleaderjob"));
+                item.put("fleader", rs.getString("fleader"));
+            }
             item.put("fplan", rs.getString("fplan"));
             item.put("fonjob", rs.getString("fonjob"));
             item.put("hasChildren", hasChildren(rs.getString("id"), false));
             item.put("expand", "1");
             item.put("fnumber", rs.getString("fnumber"));
-            item.put("fleader", rs.getString("fleader"));
             item.put("fobjid", rs.getString("fobjid"));
             item.put("fleaderlv", convertLevel(rs.getString("fleaderlv")));
             item.put("fleaderst", convertGrade(rs.getString("fleaderst")));
@@ -489,4 +496,48 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             }
         });
     }
+
+    static class OrgSelectItem {
+        private String id;
+        private String fnumber;
+        private String fname;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getFnumber() {
+            return fnumber;
+        }
+
+        public void setFnumber(String fnumber) {
+            this.fnumber = fnumber;
+        }
+
+        public String getFname() {
+            return fname;
+        }
+
+        public void setFname(String fname) {
+            this.fname = fname;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof OrgSelectItem) {
+                OrgSelectItem item = (OrgSelectItem) obj;
+                return this.getId().equals(item.getId());
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return Integer.parseInt(this.getId());
+        }
+    }
 }