From 7a653ebc48da41600d6bb0586a734495ef8492d9 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Thu, 7 Dec 2023 16:56:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7):=20=E5=A7=93=E5=90=8D/?=
 =?UTF-8?q?=E5=B7=A5=E5=8F=B7=20=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/system/controller/SysUserController.java | 4 ++++
 .../main/java/com/jero/modules/system/entity/SysUser.java | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index acc9cf57..c1700230 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -146,6 +146,10 @@ public class SysUserController {
         if (StrUtil.isNotEmpty(departId)){
             subDepIds = sysDepartService.getSubDepIdsByDepId(departId);
         }
+        if (StringUtils.isNotBlank(user.getRealnameOrUsername())){
+            queryWrapper.and(aw -> aw.like("realname", user.getRealnameOrUsername())
+                    .or().like("username", user.getRealnameOrUsername()));
+        }
 
         IPage<SysUser> pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
 
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
index 37c55964..9333b323 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jero.common.aspect.annotation.Dict;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -245,6 +244,13 @@ public class SysUser implements Serializable {
     @TableField(exist = false)
     private String departIds_dicText;
 
+    /**
+     * 姓名/工号
+     */
+    @ApiModelProperty(value = "姓名/工号")
+    @TableField(exist = false)
+    private String realnameOrUsername;
+
     /**
      * 拼接真实姓名和工号形成唯一的用户信息可用户查看
      * 不能用get开头，否则会造成初始化queryWrapper的bug