From 31d247f28e83a2133c3e02fa6f16d2ce282bf8f5 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 04 二月 2026 20:32:31 +0800
Subject: [PATCH] feat(management):帐号管理、角色管理

---
 xp-api/src/main/java/com/xiaopeng/api/model/account/SysUser.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/xp-api/src/main/java/com/xiaopeng/api/model/account/SysUser.java b/xp-api/src/main/java/com/xiaopeng/api/model/account/SysUser.java
index 8c9d458..a9db704 100644
--- a/xp-api/src/main/java/com/xiaopeng/api/model/account/SysUser.java
+++ b/xp-api/src/main/java/com/xiaopeng/api/model/account/SysUser.java
@@ -35,18 +35,20 @@
     private String userAccount;
 
     /** 用户昵称 */
-    @Excel(name = "用户名称")
+    @Excel(name = "用户昵称")
     @NotBlank(message = "姓名不能为空")
     @TableField("nick_name")
+    @ApiModelProperty(value = "用户昵称")
     private String nickName;
 
     /** 手机号码 */
     @Excel(name = "手机号码")
-    @NotBlank(message = "请输入账号")
+    @NotBlank(message = "请输入手机号码")
+    @ApiModelProperty(value = "手机号码")
     private String phoneNumber;
 
     /** 用户头像 */
-    @TableField(exist = false)
+    @ApiModelProperty(value = "用户头像")
     private String avatar;
 
     /** 密码 */
@@ -54,6 +56,7 @@
 
     /** 帐号状态(0正常 1停用) */
     @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    @ApiModelProperty(value = "帐号状态 0=正常,1=停用")
     private String status;
 
     @ApiModelProperty(value = "备注")
@@ -61,7 +64,7 @@
 
     /** 角色对象 */
     @TableField(exist = false)
-    private List<SysRole> roles;
+    private List<SysRoleBak> roles;
 
     /** 角色组 */
     @TableField(exist = false)
@@ -71,8 +74,26 @@
     @TableField(exist = false)
     private Long[] postIds;
 
+    /** 角色ID */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "角色ID")
+    private Long roleId;
+
     @ApiModelProperty(value = "角色")
     @TableField(exist = false)
     private List<String> roleNames;
 
+    @TableField(exist = false)
+    private Long deptId;
+
+    public boolean isAdmin()
+    {
+        return isAdmin(this.id);
+    }
+
+    public static boolean isAdmin(Long userId)
+    {
+        return userId != null && 1L == userId;
+    }
+
 }

--
Gitblit v1.7.1