From a76702b4a8965be7488dcb42fb654a63f65524da Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Fri, 12 Aug 2022 22:57:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ink/wgink/pojo/dtos/user/UserDTO.java     | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/basic-pojo/src/main/java/ink/wgink/pojo/dtos/user/UserDTO.java b/basic-pojo/src/main/java/ink/wgink/pojo/dtos/user/UserDTO.java
index 09c57f65..48cc58dd 100644
--- a/basic-pojo/src/main/java/ink/wgink/pojo/dtos/user/UserDTO.java
+++ b/basic-pojo/src/main/java/ink/wgink/pojo/dtos/user/UserDTO.java
@@ -52,6 +52,10 @@ public class UserDTO implements Serializable {
     private String positionIds;
     @ApiModelProperty(name = "positionNames", value = "职位名称")
     private String positionNames;
+    @ApiModelProperty(name = "groupIds", value = "组ID")
+    private String groupIds;
+    @ApiModelProperty(name = "groupNames", value = "组名称")
+    private String groupNames;
     @ApiModelProperty(name = "loginType", value = "登录类型")
     private Integer loginType;
     @ApiModelProperty(name = "gmtCreate", value = "创建时间")
@@ -217,6 +221,22 @@ public class UserDTO implements Serializable {
         this.positionNames = positionNames;
     }
 
+    public String getGroupIds() {
+        return groupIds == null ? "" : groupIds.trim();
+    }
+
+    public void setGroupIds(String groupIds) {
+        this.groupIds = groupIds;
+    }
+
+    public String getGroupNames() {
+        return groupNames == null ? "" : groupNames.trim();
+    }
+
+    public void setGroupNames(String groupNames) {
+        this.groupNames = groupNames;
+    }
+
     public Integer getLoginType() {
         return loginType;
     }
@@ -254,6 +274,8 @@ public class UserDTO implements Serializable {
         this.roleNames = userDTO.getRoleNames();
         this.positionIds = userDTO.getPositionIds();
         this.positionNames = userDTO.getPositionNames();
+        this.groupIds = userDTO.getGroupIds();
+        this.groupNames = userDTO.getGroupNames();
         this.loginType = userDTO.getLoginType();
         this.gmtCreate = userDTO.getGmtCreate();
     }
@@ -277,8 +299,8 @@ public class UserDTO implements Serializable {
                 .append(userType);
         sb.append(",\"userState\":")
                 .append(userState);
-        sb.append(",\"userExpiredDate\":")
-                .append(userExpiredDate);
+        sb.append(",\"userExpiredDate\":\"")
+                .append(userExpiredDate).append('\"');
         sb.append(",\"userAvatar\":\"")
                 .append(userAvatar).append('\"');
         sb.append(",\"lastLoginAddress\":\"")
@@ -301,6 +323,10 @@ public class UserDTO implements Serializable {
                 .append(positionIds).append('\"');
         sb.append(",\"positionNames\":\"")
                 .append(positionNames).append('\"');
+        sb.append(",\"groupIds\":\"")
+                .append(groupIds).append('\"');
+        sb.append(",\"groupNames\":\"")
+                .append(groupNames).append('\"');
         sb.append(",\"loginType\":")
                 .append(loginType);
         sb.append(",\"gmtCreate\":\"")