From eb9de2f1e34da85aba1d61748a773ae4abce8ce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B0=81=E7=BE=BD?= <2360164671@qq.com>
Date: Sat, 7 Jan 2023 11:39:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=83=A8=E9=97=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subpage/DepartmentConfig.tsx              | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/pages/configuration/subpage/DepartmentConfig.tsx b/src/pages/configuration/subpage/DepartmentConfig.tsx
index e12fa89..b0a777b 100644
--- a/src/pages/configuration/subpage/DepartmentConfig.tsx
+++ b/src/pages/configuration/subpage/DepartmentConfig.tsx
@@ -34,10 +34,10 @@ class DepartmentConfig extends React.Component<any, any> {
             }
         })
         if (newRow) {
-            let data={
+            let data = {
                 departmentName: row.departmentName,
                 departmentManagerId: row.departmentManagerId,
-                staffIds:[]
+                staffIds: []
             }
             axiosInstance.post("management/department", data).then((res) => {
                 this.update()
@@ -45,11 +45,11 @@ class DepartmentConfig extends React.Component<any, any> {
                 this.update()
             })
         } else {
-            let data={
+            let data = {
                 departmentName: row.departmentName,
                 departmentManagerId: row.departmentManagerId,
             }
-            axiosInstance.put("management/department/"+row.departmentId, data).then((res) => {
+            axiosInstance.put("management/department/" + row.departmentId, data).then((res) => {
                 this.update()
             }).catch((err) => {
                 this.update()
@@ -76,15 +76,16 @@ class DepartmentConfig extends React.Component<any, any> {
             return []
         }
         let res = []
+        console.log(columns)
         for (let i = 0; i < columns.length; i++) {
-            console.log(columns[i].departmentName)
-            res.push({
-                id: columns[i].departmentId,
-                departmentId: columns[i].departmentId,
-                departmentName: columns[i].departmentName,
-                departmentManagerId: columns[i].departmentManager.staffId,
-                departmentManagerName: columns[i].departmentManager.staffName,
-            })
+            if (columns[i].deletedAt == null)
+                res.push({
+                    id: columns[i].departmentId,
+                    departmentId: columns[i].departmentId,
+                    departmentName: columns[i].departmentName,
+                    departmentManagerId: columns[i].departmentManager.staffId,
+                    departmentManagerName: columns[i].departmentManager.staffName,
+                })
         }
         console.log(res);
         return res