From 4682901bb6cb9da6909cdd60e5111bf0e147a5dd Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Sat, 18 Jun 2022 16:03:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=88=9B=E5=BB=BA=E4=BA=BA?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9F=A5=E8=AF=A2=E4=BA=BA=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java  |  3 ++
 .../system/enums/UserOrDepartEnum.java        | 28 +++++++++++++++++++
 .../modules/system/vo/SysUserDepartVO.java    | 10 +++++++
 jero-web/src/components/setCreator/index.vue  |  6 +++-
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/UserOrDepartEnum.java

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index b21d6e534..25213835a 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -26,6 +26,7 @@ import com.jero.common.util.RedisUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.base.service.BaseCommonService;
 import com.jero.modules.system.entity.*;
+import com.jero.modules.system.enums.UserOrDepartEnum;
 import com.jero.modules.system.model.DepartIdModel;
 import com.jero.modules.system.model.SysUserSysDepartModel;
 import com.jero.modules.system.service.*;
@@ -1554,6 +1555,7 @@ public class SysUserController {
                 SysUserDepartVO sysUserDepartVO = new SysUserDepartVO();
                 sysUserDepartVO.setKey(sysDepart.getId());
                 sysUserDepartVO.setTitle(sysDepart.getDepartName());
+                sysUserDepartVO.setFlag(UserOrDepartEnum.USER.getValue());
                 list.add(sysUserDepartVO);
             }
         }
@@ -1562,6 +1564,7 @@ public class SysUserController {
                 SysUserDepartVO sysUserDepartVO = new SysUserDepartVO();
                 sysUserDepartVO.setKey(sysUser.getId());
                 sysUserDepartVO.setTitle(sysUser.getUsername());
+                sysUserDepartVO.setFlag(UserOrDepartEnum.DEPART.getValue());
                 list.add(sysUserDepartVO);
             }
         }
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/UserOrDepartEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/UserOrDepartEnum.java
new file mode 100644
index 000000000..f77366654
--- /dev/null
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/UserOrDepartEnum.java
@@ -0,0 +1,28 @@
+package com.jero.modules.system.enums;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 14:12 2022/5/26
+ */
+public enum UserOrDepartEnum {
+
+    USER("同步部门","USER"),
+    DEPART("同步用户","DEPART");
+
+    private String name;
+    private String value;
+
+    private UserOrDepartEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserDepartVO.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserDepartVO.java
index 12c2ef0ae..4b60203d3 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserDepartVO.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserDepartVO.java
@@ -11,6 +11,8 @@ public class SysUserDepartVO {
 
     private String title;
 
+    private String flag; //depart，user 2个属性
+
     public String getKey() {
         return key;
     }
@@ -26,4 +28,12 @@ public class SysUserDepartVO {
     public void setTitle(String title) {
         this.title = title;
     }
+
+    public String getFlag() {
+        return flag;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
 }
diff --git a/jero-web/src/components/setCreator/index.vue b/jero-web/src/components/setCreator/index.vue
index 843b9ab1f..5f28bf5e8 100644
--- a/jero-web/src/components/setCreator/index.vue
+++ b/jero-web/src/components/setCreator/index.vue
@@ -136,7 +136,11 @@
       },
       getUserAndDepart() {
         getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => {
-          this.gData = res || []
+          if (res){
+            this.gData = res.filter(ele => ele.flag === 'DEPART');
+          } else {
+            this.gData = []
+          }
           this.visibleTree = true
         })
       },