From 701d7fbb62edf3602f90a1b0cf57fb5d76f6a617 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Wed, 21 Dec 2022 11:29:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/palmte/work/model/Dept.java  | 54 +++++++++++++++++++
 .../cn/palmte/work/service/DeptService.java   | 14 ++---
 .../templates/admin/department_list.ftl       |  4 ++
 3 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cn/palmte/work/model/Dept.java b/src/main/java/cn/palmte/work/model/Dept.java
index 63e0c6b..5f09c3b 100644
--- a/src/main/java/cn/palmte/work/model/Dept.java
+++ b/src/main/java/cn/palmte/work/model/Dept.java
@@ -23,6 +23,14 @@ public class Dept {
 
     private String name;
 
+    @Column(name = "manager_id")
+    private Integer managerId;
+
+    private Integer level;
+
+    @Column(name = "parent_id")
+    private Integer parentId;
+
     private int enabled;
 
     @Column(name = "created_by")
@@ -41,6 +49,12 @@ public class Dept {
     @Transient
     private String status;
 
+    @Transient
+    private String realName;
+
+    @Transient
+    private String parentName;
+
     public Integer getId() {
         return id;
     }
@@ -57,6 +71,30 @@ public class Dept {
         this.name = name;
     }
 
+    public Integer getManagerId() {
+        return managerId;
+    }
+
+    public void setManagerId(Integer managerId) {
+        this.managerId = managerId;
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
     public int getEnabled() {
         return enabled;
     }
@@ -96,4 +134,20 @@ public class Dept {
     public void setStatus(String status) {
         this.status = status;
     }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/cn/palmte/work/service/DeptService.java b/src/main/java/cn/palmte/work/service/DeptService.java
index 2e8f0e5..5152b39 100644
--- a/src/main/java/cn/palmte/work/service/DeptService.java
+++ b/src/main/java/cn/palmte/work/service/DeptService.java
@@ -36,14 +36,16 @@ public class DeptService {
     }
 
     public Page<Dept> list(Map<String, String> searchInfo, int pageNumber, int pageSize){
-        QueryHelper queryHelper = new QueryHelper("SELECT *, (CASE enabled WHEN 0 THEN '已禁用' WHEN 1 THEN '已启用' END) as status","dept");
-        queryHelper.addCondition(searchInfo.containsKey("name"), "name like ?", "%" +
+        QueryHelper queryHelper = new QueryHelper("SELECT d.*, (CASE d.enabled WHEN 0 THEN '已禁用' WHEN 1 THEN '已启用' END) as status, su.real_name as realName, (CASE WHEN d.level = 1 THEN '' ELSE p.name END) as parentName","dept d");
+        queryHelper.leftJoin("dept p", "d.parent_id = p.id");
+        queryHelper.leftJoin("sys_user su", "d.manager_id = su.id");
+        queryHelper.addCondition(searchInfo.containsKey("name"), "d.name like ?", "%" +
                 searchInfo.get("name") + "%");
         queryHelper.addCondition(searchInfo.containsKey("enabled") && !"-1".equals(searchInfo.get("enabled")),
-                "enabled=" + searchInfo.get("enabled"));
-        queryHelper.addCondition(searchInfo.containsKey("startTime"), "created_time >= ?", searchInfo.get("startTime") + " 00:00:00");
-        queryHelper.addCondition(searchInfo.containsKey("endTime"), "created_time <= ?", searchInfo.get("endTime") + " 23:59:59");
-        queryHelper.addOrderProperty("created_time", false);
+                "d.enabled=" + searchInfo.get("enabled"));
+        queryHelper.addCondition(searchInfo.containsKey("startTime"), "d.created_time >= ?", searchInfo.get("startTime") + " 00:00:00");
+        queryHelper.addCondition(searchInfo.containsKey("endTime"), "d.created_time <= ?", searchInfo.get("endTime") + " 23:59:59");
+        queryHelper.addOrderProperty("d.id", false);
         Page<Dept> paginate = pagination.paginate(queryHelper.getSql(), Dept.class, pageNumber, pageSize);
         return paginate;
     }
diff --git a/src/main/resources/templates/admin/department_list.ftl b/src/main/resources/templates/admin/department_list.ftl
index f97dc98..6de86f4 100644
--- a/src/main/resources/templates/admin/department_list.ftl
+++ b/src/main/resources/templates/admin/department_list.ftl
@@ -91,6 +91,8 @@
                         <tr class="am-text-nowrap">
                             <th class="table-title">序号</th>
                             <th class="table-title">部门名称</th>
+                            <th class="table-title">部门领导</th>
+                            <th class="table-title">所属上级</th>
                             <th class="table-title">创建人</th>
                             <th class="table-title">创建时间</th>
                             <th class="table-title">操作</th>
@@ -102,6 +104,8 @@
                                 <tr>
                                     <td>${list.tempId!}</td>
                                     <td>${list.name!}</td>
+                                    <td>${list.realName!}</td>
+                                    <td>${list.parentName!}</td>
                                     <td>${list.createdBy!}</td>
                                     <td><#if list.createdTime??>${list.createdTime?datetime}</#if></td>
                                     <td>