From 3aab3afae047b1c77ef5bd60557ac1753d34ca28 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 2 May 2022 02:53:00 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=A3=20=E5=88=B6=E5=AE=9A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=A7=84=E8=8C=83=E6=A8=A1=E6=9D=BF=E5=9B=A2=E9=98=9F?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cloud/kicc/system/controller/DeptController.java    | 5 ++++-
 kicc-ui/src/views/system/dept/DeptModal.vue                 | 6 +++---
 kicc-ui/src/views/system/dept/dept.data.ts                  | 5 ++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DeptController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DeptController.java
index 112e1f6a..2bdfe843 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DeptController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DeptController.java
@@ -8,6 +8,7 @@ import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.common.log.annotation.SysLog;
 import com.cloud.kicc.system.api.entity.Dept;
+import com.cloud.kicc.system.api.entity.Menu;
 import com.cloud.kicc.system.api.entity.User;
 import com.cloud.kicc.system.service.DeptService;
 import com.cloud.kicc.system.service.UserService;
@@ -36,7 +37,9 @@ public class DeptController {
     private LambdaQueryWrapper<Dept> getQueryWrapper(Dept dept) {
         return Wrappers.<Dept>lambdaQuery()
                 .like(StrUtil.isNotBlank(dept.getName()), Dept::getName, dept.getName())
-                .eq(StrUtil.isNotBlank(dept.getStatus()), Dept::getStatus, dept.getStatus());
+                .eq(StrUtil.isNotBlank(dept.getStatus()), Dept::getStatus, dept.getStatus())
+                .between(StrUtil.isNotBlank(dept.getBeginTime()) && StrUtil.isNotBlank(dept.getEndTime()), Dept::getCreateTime, dept.getBeginTime(), dept.getEndTime())
+                .orderByAsc(Dept::getSort);
     }
 
     @GetMapping("/list")
diff --git a/kicc-ui/src/views/system/dept/DeptModal.vue b/kicc-ui/src/views/system/dept/DeptModal.vue
index 8c92e50a..75f93f56 100644
--- a/kicc-ui/src/views/system/dept/DeptModal.vue
+++ b/kicc-ui/src/views/system/dept/DeptModal.vue
@@ -37,9 +37,9 @@
     await clearValidate();
     // 处理设置数据
     tag.value = data._tag;
-    const topDept = { id: '0', name: '顶级部门', children: [] };
-    topMenu.children = listToTree(await listDept());
-    await updateSchema(  {
+    const topDept = { deptId: '0', name: '顶级部门', children: [] };
+    topDept.children = listToTree(await listDept());
+    await updateSchema({
       field: 'parentId',
       componentProps: {
         treeData: [topDept]
diff --git a/kicc-ui/src/views/system/dept/dept.data.ts b/kicc-ui/src/views/system/dept/dept.data.ts
index 1653d561..91aa1adb 100644
--- a/kicc-ui/src/views/system/dept/dept.data.ts
+++ b/kicc-ui/src/views/system/dept/dept.data.ts
@@ -23,8 +23,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '排序',
-    dataIndex: 'sort',
-    width: 80
+    dataIndex: 'sort'
   },
   {
     title: '状态',
@@ -36,7 +35,7 @@ export const columns: BasicColumn[] = [
       // 第一次取反会运算为-1,在后一次取反会运算为0
       const enable = ~~status === 0;
       const color = enable ? 'green' : 'red';
-      const text = enable ? '启用' : '停用';
+      const text = enable ? '正常' : '停用';
       return h(Tag, { color: color }, () => text);
     }
   },