From d4b02ba9180f82084e5ca844eaa9b4a0966a0164 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Thu, 7 Nov 2024 22:23:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AD=97=E5=85=B8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../continew/admin/system/model/entity/UserDO.java   |  2 ++
 .../admin/controller/common/CommonController.java    | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java
index e3ec4834..9f5406ee 100644
--- a/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java
+++ b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java
@@ -23,6 +23,7 @@ import lombok.Data;
 import top.continew.admin.common.config.mybatis.BCryptEncryptor;
 import top.continew.admin.common.enums.DisEnableStatusEnum;
 import top.continew.admin.common.enums.GenderEnum;
+import top.continew.starter.extension.crud.annotation.DictField;
 import top.continew.starter.extension.crud.model.entity.BaseDO;
 import top.continew.starter.security.crypto.annotation.FieldEncrypt;
 
@@ -36,6 +37,7 @@ import java.time.LocalDateTime;
  * @since 2022/12/21 20:42
  */
 @Data
+@DictField(labelKey = "nickname")
 @TableName("sys_user")
 public class UserDO extends BaseDO {
 
diff --git a/continew-webapi/src/main/java/top/continew/admin/controller/common/CommonController.java b/continew-webapi/src/main/java/top/continew/admin/controller/common/CommonController.java
index d122ac05..619942af 100644
--- a/continew-webapi/src/main/java/top/continew/admin/controller/common/CommonController.java
+++ b/continew-webapi/src/main/java/top/continew/admin/controller/common/CommonController.java
@@ -32,10 +32,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import top.continew.admin.common.constant.CacheConstants;
-import top.continew.admin.system.model.query.DeptQuery;
-import top.continew.admin.system.model.query.MenuQuery;
-import top.continew.admin.system.model.query.OptionQuery;
-import top.continew.admin.system.model.query.RoleQuery;
+import top.continew.admin.system.model.query.*;
 import top.continew.admin.system.model.resp.FileUploadResp;
 import top.continew.admin.system.service.*;
 import top.continew.starter.core.util.validate.ValidationUtils;
@@ -62,6 +59,7 @@ public class CommonController {
     private final FileService fileService;
     private final DeptService deptService;
     private final MenuService menuService;
+    private final UserService userService;
     private final RoleService roleService;
     private final DictItemService dictItemService;
     private final OptionService optionService;
@@ -92,6 +90,12 @@ public class CommonController {
         return menuService.tree(query, sortQuery, true);
     }
 
+    @Operation(summary = "查询用户字典", description = "查询用户字典列表")
+    @GetMapping("/dict/user")
+    public List<LabelValueResp> listUserDict(UserQuery query, SortQuery sortQuery) {
+        return userService.listDict(query, sortQuery);
+    }
+
     @Operation(summary = "查询角色字典", description = "查询角色字典列表")
     @GetMapping("/dict/role")
     public List<LabelValueResp> listRoleDict(RoleQuery query, SortQuery sortQuery) {