From 902577792e2806b00308c8495935b6bb7cc9f962 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Mon, 13 Mar 2023 15:22:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=83=A8=E9=97=A8=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=94=A8=E6=88=B7=E7=BB=84=E4=BB=B6=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=BB=84=E7=BB=87=E5=90=8E=E6=97=A0=E6=B3=95=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=20bug=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysUserController.java | 11 +++++++++-- .../modules/system/mapper/SysUserDepartMapper.java | 4 ++-- .../modules/system/mapper/xml/SysUserDepartMapper.xml | 5 ++++- .../modules/system/service/ISysUserDepartService.java | 6 +++--- .../system/service/impl/SysUserDepartServiceImpl.java | 4 ++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 8af43b7a..72eb6da3 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -430,10 +430,17 @@ public class SysUserController { //@RequiresPermissions("sys:user:list") // @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET) @GetMapping("/queryUserByDepId") - public Result> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="realname",required=false) String realname) { + public Result> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="realname",required=false) String realname ,@RequestParam(name="username",required=false) String username) { Result> result = new Result<>(); SysDepart sysDepart = sysDepartService.getById(id); - List userList = sysUserDepartService.queryUserByDepCode(sysDepart.getOrgCode(),realname); + //去除前端传回参数两边的* + if(StringUtils.isNotBlank(realname)){ + realname = StringUtils.strip(realname,"*"); + } + if(StringUtils.isNotBlank(username)){ + username = StringUtils.strip(username,"*"); + } + List userList = sysUserDepartService.queryUserByDepCode(sysDepart.getOrgCode(),realname,username); //批量查询用户的所属部门 //step.1 先拿到全部的 useids diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserDepartMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserDepartMapper.java index 66c47793..04d060f6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserDepartMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserDepartMapper.java @@ -10,7 +10,7 @@ import com.jero.modules.system.entity.SysUserDepart; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface SysUserDepartMapper extends BaseMapper{ - + List getUserDepartByUid(@Param("userId") String userId); /** @@ -19,7 +19,7 @@ public interface SysUserDepartMapper extends BaseMapper{ * @param realname * @return */ - List queryDepartUserList(@Param("orgCode") String orgCode, @Param("realname") String realname); + List queryDepartUserList(@Param("orgCode") String orgCode, @Param("realname") String realname,@Param("username") String username); /** * 根据部门查询部门用户 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserDepartMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserDepartMapper.xml index 1f6072d6..7ca1d45c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserDepartMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserDepartMapper.xml @@ -17,6 +17,9 @@ and a.realname like '%${realname}%' + + and a.username like '%${username}%' + @@ -33,4 +36,4 @@ - \ No newline at end of file + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserDepartService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserDepartService.java index 3c97dd18..0a7a4088 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserDepartService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserDepartService.java @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * */ public interface ISysUserDepartService extends IService { - + /** * 根据指定用户id查询部门信息 @@ -27,7 +27,7 @@ public interface ISysUserDepartService extends IService { * @return */ List queryDepartIdsOfUser(String userId); - + /** * 根据部门id查询用户信息 @@ -39,7 +39,7 @@ public interface ISysUserDepartService extends IService { /** * 根据部门code，查询当前部门和下级部门的用户信息 */ - List queryUserByDepCode(String depCode,String realname); + List queryUserByDepCode(String depCode,String realname,String username); /** * 用户组件数据查询 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java index ef31d7b5..a5855565 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java @@ -98,12 +98,12 @@ public class SysUserDepartServiceImpl extends ServiceImpl queryUserByDepCode(String depCode,String realname) { + public List queryUserByDepCode(String depCode,String realname,String unsername) { //update-begin-author:taoyan date:20210422 for: 根据部门选择用户接口代码优化 if(oConvertUtils.isNotEmpty(realname)){ realname = realname.trim(); } - List userList = this.baseMapper.queryDepartUserList(depCode, realname); + List userList = this.baseMapper.queryDepartUserList(depCode, realname,unsername); Map map = new HashMap<>(); for (SysUser sysUser : userList) { // 返回的用户数据去掉密码信息