Merge branch 'fu-dev' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDeptServiceImpl.java

@@ -21,7 +21,6 @@ import com.usky.system.service.ISysDeptService;
 import com.usky.system.service.vo.TreeNode;
 import com.usky.system.service.vo.TreeSelect;
 import com.usky.system.service.vo.UserPostVo;
-import org.omg.CORBA.StringHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/TreeNode.java

@@ -30,15 +30,15 @@ public class TreeNode implements Serializable {
      */
     private String label;
 
-    /**
-     * 用户头像
-     */
-    private String avatar;
-
-    /**
-     * 用户职位
-     */
-    private String post;
+//    /**
+//     * 用户头像
+//     */
+//    private String avatar;
+//
+//    /**
+//     * 用户职位
+//     */
+//    private String post;
 
     /**
      * 子节点
@@ -55,13 +55,13 @@ public class TreeNode implements Serializable {
         this.children = children;
     }
 
-    public TreeNode(SysUser user) {
-        this.id = user.getUserId();
-        this.label = user.getNickName();
-        this.avatar = user.getAvatar();
-        this.post = user.getPost();
-        this.children = new ArrayList<>();
-    }
+//    public TreeNode(SysUser user) {
+//        this.id = user.getUserId();
+//        this.label = user.getNickName();
+//        this.avatar = user.getAvatar();
+//        this.post = user.getPost();
+//        this.children = new ArrayList<>();
+//    }
 
     public TreeNode(SysDept dept) {
         this.id = dept.getDeptId();
@@ -70,7 +70,7 @@ public class TreeNode implements Serializable {
         if (dept.getChildren() != null && !dept.getChildren().isEmpty()) {
             this.children = dept.getChildren().stream().map(TreeNode::new).collect(Collectors.toList());
         } else if (dept.getUsers() != null && !dept.getUsers().isEmpty()) {
-            this.children = dept.getUsers().stream().map(TreeNode::new).collect(Collectors.toList());
+            this.children = dept.getUsers().stream().map(UserTreeNode::new).collect(Collectors.toList());
         }
     }
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/UserTreeNode.java

@@ -0,0 +1,62 @@
+package com.usky.system.service.vo;
+import com.usky.system.domain.SysDeptVO;
+import com.usky.system.domain.SysUser;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+
+/**
+ * @description：TODO
+ * @author： fu
+ * @create： 2024-08-01 11:40
+ */
+@Data
+public class UserTreeNode extends TreeNode {
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 部门ID */
+    private Long deptId;
+
+    /** 用户账号 */
+    private String userName;
+
+    /** 用户昵称 */
+    private String nickName;
+
+    /** 用户邮箱 */
+    private String email;
+
+    /** 手机号码 */
+    private String phonenumber;
+
+    /** 用户性别 */
+    private String sex;
+
+    /** 用户头像 */
+    private String avatar;
+
+    /** 地址 */
+    private String address;
+
+    /** 岗位 */
+    private String post;
+
+
+    public UserTreeNode(SysUser user) {
+        super(user.getUserId(), user.getNickName(), new ArrayList<>());
+        this.userId = user.getUserId();
+        this.deptId = user.getDeptId();
+        this.userName = user.getUserName();
+        this.nickName = user.getNickName();
+        this.email = user.getEmail();
+        this.phonenumber = user.getPhonenumber();
+        this.sex = user.getSex();
+        this.avatar = user.getAvatar();
+        this.address = user.getAddress();
+        this.post = user.getPost();
+    }
+}
+