From f804dc0338f064c845ac9c62257f2ee5a7fe953b Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Thu, 16 Jan 2025 10:00:12 +0800
Subject: [PATCH] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/infra/entity/dto/role/SystemRoleDTO.java |  3 +++
 .../module/infra/entity/dto/user/SystemUserDTO.java |  3 +++
 .../module/infra/entity/domain/SystemRoleDO.java    |  4 ++++
 .../module/infra/entity/domain/SystemUserDO.java    |  4 ++++
 .../entity/request/dict/DictKeyCreateRequest.java   |  2 +-
 .../entity/request/dict/DictKeyQueryRequest.java    |  2 +-
 .../entity/request/dict/DictKeyUpdateRequest.java   |  2 +-
 .../request/role/SystemRoleCreateRequest.java       |  4 ++++
 .../entity/request/role/SystemRoleQueryRequest.java |  4 ++++
 .../request/role/SystemRoleUpdateRequest.java       |  4 ++++
 .../request/user/SystemUserCreateRequest.java       |  4 ++++
 .../entity/request/user/SystemUserQueryRequest.java |  4 ++++
 .../request/user/SystemUserUpdateRequest.java       |  4 ++++
 .../visor/module/infra/entity/vo/SystemRoleVO.java  |  3 +++
 .../visor/module/infra/entity/vo/SystemUserVO.java  |  3 +++
 .../infra/service/impl/SystemRoleServiceImpl.java   |  5 +++--
 .../infra/service/impl/SystemUserServiceImpl.java   |  3 ++-
 .../src/main/resources/mapper/SystemRoleMapper.xml  |  9 +++++----
 .../src/main/resources/mapper/SystemUserMapper.xml  | 13 +++++++------
 19 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java
index b5b37774..c96732c7 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java
@@ -58,4 +58,7 @@ public class SystemRoleDTO implements Serializable {
     @Schema(description = "状态 0停用 1启用")
     private Integer status;
 
+    @Schema(description = "描述")
+    private String description;
+
 }
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserDTO.java
index 0f6967af..1d2b1170 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserDTO.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserDTO.java
@@ -71,4 +71,7 @@ public class SystemUserDTO implements Serializable {
     @Schema(description = "最后登录时间")
     private Date lastLoginTime;
 
+    @Schema(description = "描述")
+    private String description;
+
 }
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java
index 52717490..127147f1 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java
@@ -64,4 +64,8 @@ public class SystemRoleDO extends BaseDO {
     @TableField("status")
     private Integer status;
 
+    @Schema(description = "描述")
+    @TableField("description")
+    private String description;
+
 }
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java
index 2fbbfb0a..7c553286 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java
@@ -94,4 +94,8 @@ public class SystemUserDO extends BaseDO {
     @TableField("last_login_time")
     private Date lastLoginTime;
 
+    @Schema(description = "描述")
+    @TableField("description")
+    private String description;
+
 }
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java
index f4bd24af..a5e5252a 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java
@@ -63,7 +63,7 @@ public class DictKeyCreateRequest implements Serializable {
     private String extraSchema;
 
     @NotBlank
-    @Size(max = 64)
+    @Size(max = 255)
     @Schema(description = "配置描述")
     private String description;
 
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java
index c08b9359..f0032e36 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java
@@ -53,7 +53,7 @@ public class DictKeyQueryRequest extends PageRequest {
     @Schema(description = "配置项")
     private String keyName;
 
-    @Size(max = 64)
+    @Size(max = 255)
     @Schema(description = "配置描述")
     private String description;
 
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java
index 903303a8..acf68f95 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java
@@ -68,7 +68,7 @@ public class DictKeyUpdateRequest implements Serializable {
     private String extraSchema;
 
     @NotBlank
-    @Size(max = 64)
+    @Size(max = 255)
     @Schema(description = "配置描述")
     private String description;
 
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java
index e498c4ba..6c34a56f 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java
@@ -56,4 +56,8 @@ public class SystemRoleCreateRequest implements Serializable {
     @Schema(description = "角色编码")
     private String code;
 
+    @Size(max = 255)
+    @Schema(description = "描述")
+    private String description;
+
 }
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java
index e508ef44..db62934d 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java
@@ -57,4 +57,8 @@ public class SystemRoleQueryRequest extends PageRequest {
     @Schema(description = "状态 0停用 1启用")
     private Integer status;
 
+    @Size(max = 255)
+    @Schema(description = "描述")
+    private String description;
+
 }
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java
index 6b0d9332..588d58b2 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java
@@ -56,4 +56,8 @@ public class SystemRoleUpdateRequest implements Serializable {
     @Schema(description = "角色名称")
     private String name;
 
+    @Size(max = 255)
+    @Schema(description = "描述")
+    private String description;
+
 }
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java
index 80f69c34..57c2ced5 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java
@@ -72,4 +72,8 @@ public class SystemUserCreateRequest implements Serializable {
     @Schema(description = "邮箱")
     private String email;
 
+    @Size(max = 255)
+    @Schema(description = "描述")
+    private String description;
+
 }
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java
index e5aa40ff..4ad28f12 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java
@@ -65,4 +65,8 @@ public class SystemUserQueryRequest extends PageRequest {
     @Schema(description = "用户状态 0停用 1启用")
     private Integer status;
 
+    @Size(max = 255)
+    @Schema(description = "描述")
+    private String description;
+
 }
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java
index 636426b8..06772963 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java
@@ -62,4 +62,8 @@ public class SystemUserUpdateRequest implements Serializable {
     @Schema(description = "邮箱")
     private String email;
 
+    @Size(max = 255)
+    @Schema(description = "描述")
+    private String description;
+
 }
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java
index a6cc7967..1a51d552 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java
@@ -59,6 +59,9 @@ public class SystemRoleVO implements Serializable {
     @Schema(description = "状态 0停用 1启用")
     private Integer status;
 
+    @Schema(description = "描述")
+    private String description;
+
     @Schema(description = "创建时间")
     private Date createTime;
 
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserVO.java
index ac2121ad..6b597796 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserVO.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserVO.java
@@ -84,6 +84,9 @@ public class SystemUserVO implements Serializable {
     @Schema(description = "修改人")
     private String updater;
 
+    @Schema(description = "描述")
+    private String description;
+
     @Schema(description = "用户角色")
     private List<SystemRoleVO> roles;
 
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java
index 8c32a6ab..401749d5 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java
@@ -171,9 +171,10 @@ public class SystemRoleServiceImpl implements SystemRoleService {
         // 构造条件
         LambdaQueryWrapper<SystemRoleDO> wrapper = systemRoleDAO.wrapper()
                 .eq(SystemRoleDO::getId, request.getId())
-                .like(SystemRoleDO::getName, request.getName())
                 .eq(SystemRoleDO::getCode, request.getCode())
-                .eq(SystemRoleDO::getStatus, request.getStatus());
+                .eq(SystemRoleDO::getStatus, request.getStatus())
+                .like(SystemRoleDO::getName, request.getName())
+                .like(SystemRoleDO::getDescription, request.getDescription());
         // 查询
         return systemRoleDAO.of(wrapper)
                 .page(request)
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java
index 1428bf0d..817ca392 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java
@@ -395,11 +395,12 @@ public class SystemUserServiceImpl implements SystemUserService {
     public LambdaQueryWrapper<SystemUserDO> buildQueryWrapper(SystemUserQueryRequest request) {
         return systemUserDAO.wrapper()
                 .eq(SystemUserDO::getId, request.getId())
+                .eq(SystemUserDO::getStatus, request.getStatus())
                 .like(SystemUserDO::getUsername, request.getUsername())
                 .like(SystemUserDO::getNickname, request.getNickname())
                 .like(SystemUserDO::getMobile, request.getMobile())
                 .like(SystemUserDO::getEmail, request.getEmail())
-                .eq(SystemUserDO::getStatus, request.getStatus());
+                .like(SystemUserDO::getDescription, request.getDescription());
     }
 
 }
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml
index 50ca80cf..7cf951d7 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml
@@ -5,19 +5,20 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="org.dromara.visor.module.infra.entity.domain.SystemRoleDO">
         <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="code" property="code"/>
+        <result column="status" property="status"/>
+        <result column="description" property="description"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="creator" property="creator"/>
         <result column="updater" property="updater"/>
         <result column="deleted" property="deleted"/>
-        <result column="name" property="name"/>
-        <result column="code" property="code"/>
-        <result column="status" property="status"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, code, status, create_time, update_time, creator, updater, deleted
+        id, name, code, status, description, create_time, update_time, creator, updater, deleted
     </sql>
 
     <select id="getRoleIdByUserIdAndRoleCode" resultType="java.lang.Long">
diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemUserMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemUserMapper.xml
index 1e07e3da..36e02f5d 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemUserMapper.xml
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemUserMapper.xml
@@ -5,11 +5,6 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="org.dromara.visor.module.infra.entity.domain.SystemUserDO">
         <id column="id" property="id"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="creator" property="creator"/>
-        <result column="updater" property="updater"/>
-        <result column="deleted" property="deleted"/>
         <result column="username" property="username"/>
         <result column="password" property="password"/>
         <result column="nickname" property="nickname"/>
@@ -20,11 +15,17 @@
         <result column="update_password_status" property="updatePasswordStatus"/>
         <result column="update_password_reason" property="updatePasswordReason"/>
         <result column="last_login_time" property="lastLoginTime"/>
+        <result column="description" property="description"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="creator" property="creator"/>
+        <result column="updater" property="updater"/>
+        <result column="deleted" property="deleted"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, username, password, nickname, avatar, mobile, email, status, update_password_status, update_password_reason, last_login_time, create_time, update_time, creator, updater, deleted
+        id, username, password, nickname, avatar, mobile, email, status, update_password_status, update_password_reason, last_login_time, description, create_time, update_time, creator, updater, deleted
     </sql>
 
 </mapper>