From f066939685f578336884b86bf001bf9fab19d488 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期三, 30 十一月 2022 10:37:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/system/entity/User.java |  110 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 99 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index 17bcfbc..98d856f 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/src/main/java/com/zy/system/entity/User.java
@@ -4,16 +4,16 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.service.HostService;
-import com.zy.system.service.RoleService;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.system.service.HostService;
+import com.zy.system.service.RoleService;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-//import com.zy.system.service.RoleService;
+//import com.zy.sc.system.service.RoleService;
 
 @TableName("sys_user")
 public class User implements Serializable {
@@ -32,10 +32,28 @@
     @TableField("host_id")
     private Long hostId;
 
+
+    /**
+     * 鎵�灞為儴闂�
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 瑙掕壊
+     */
+    @TableField("role_id")
+    private Long roleId;
+
     /**
      * 璐﹀彿
      */
     private String username;
+
+    /**
+     * 鍚嶇О
+     */
+    private String nickname;
 
     /**
      * 鎵嬫満鍙�
@@ -48,10 +66,19 @@
     private String password;
 
     /**
-     * 瑙掕壊
+     * 澶村儚
      */
-    @TableField("role_id")
-    private Long roleId;
+    private String avatar;
+
+    /**
+     * 閭
+     */
+    private String email;
+
+    /**
+     * 鎬у埆 0: 鐢�  1:  濂�   2:  鏈煡
+     */
+    private Integer sex;
 
     /**
      * 娉ㄥ唽鏃堕棿
@@ -60,7 +87,7 @@
     private Date createTime;
 
     /**
-     * 鐘舵�� 1: 鍚敤  2: 鍐荤粨  3: 鍒犻櫎  
+     * 鐘舵�� 1: 鍚敤  0: 绂佺敤
      */
     private Integer status;
 
@@ -93,8 +120,33 @@
         this.hostId = hostId;
     }
 
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public String getDeptName() {
+//        DeptService service = SpringUtils.getBean(DeptService.class);
+//        Dept dept = service.selectById(this.deptId);
+//        if (!Cools.isEmpty(dept)){
+//            return dept.getName();
+//        }
+        return null;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
     public void setUsername(String username) {
         this.username = username;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
     }
 
     public String getMobile() {
@@ -111,6 +163,44 @@
 
     public void setPassword(String password) {
         this.password = password;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public String getSex$(){
+        if (null == this.sex){ return null; }
+        switch (this.sex){
+            case 0:
+                return "鐢�";
+            case 1:
+                return "濂�";
+            case 2:
+                return "鏈煡";
+            default:
+                return String.valueOf(this.sex);
+        }
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
     }
 
     public Long getRoleId() {
@@ -154,10 +244,8 @@
         switch (this.status){
             case 1:
                 return "鍚敤";
-            case 2:
-                return "鍐荤粨";
-            case 3:
-                return "鍒犻櫎";
+            case 0:
+                return "绂佺敤";
             default:
                 return String.valueOf(this.status);
         }

--
Gitblit v1.9.1