24282 2 년 전
부모
커밋
a8044d9021

+ 14 - 1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -154,6 +154,11 @@ public class SysUser extends BaseEntity {
      */
     private String userCode;
 
+    /**
+     * 关键字
+     */
+    private String keyword;
+
     public SysUser() {
 
     }
@@ -354,6 +359,14 @@ public class SysUser extends BaseEntity {
         this.userCode = userCode;
     }
 
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
     @Override
     public String toString() {
         return "SysUser{" +
@@ -379,7 +392,7 @@ public class SysUser extends BaseEntity {
                 ", roleId=" + roleId +
                 ", tenantId='" + tenantId + '\'' +
                 ", userCode='" + userCode + '\'' +
+                ", keyword='" + keyword + '\'' +
                 '}';
     }
-    
 }

+ 3 - 0
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -132,6 +132,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
 			ancestors) ))
 		</if>
+		<if test="keyword != null and keyword != ''">
+			AND (instr(u.nick_name,#{keyword}) or instr(u.user_name,#{keyword}))
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>