|
@@ -602,6 +602,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
String pageSize = paramsMap.get("pageSize");
|
|
|
String code = paramsMap.get("code");
|
|
|
String farmType = paramsMap.get("farmType");
|
|
|
+ String userName = paramsMap.get("userName");
|
|
|
SysUser sysUser = this.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
Integer userType = sysUser.getUserType();
|
|
|
|
|
@@ -609,10 +610,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
queryWrapper.eq(!StringUtils.isBlank(farmType), "farm_type", farmType);
|
|
|
if (userType == 0) {
|
|
|
queryWrapper.eq("user_type", 3)
|
|
|
- .like(StringUtils.isNotBlank(code), "detailed_adress_code", code);
|
|
|
+ .like(StringUtils.isNotBlank(code), "detailed_adress_code", code).like(StringUtils.isNotBlank(userName),"user_name",userName);
|
|
|
} else {
|
|
|
queryWrapper.eq("user_type", 3)
|
|
|
- .like(StringUtils.isNotBlank(code), "detailed_adress_code", sysUser.getBriefAddressCode());
|
|
|
+ .like(StringUtils.isNotBlank(code), "detailed_adress_code", sysUser.getBriefAddressCode()).like(StringUtils.isNotBlank(userName),"user_name",userName);
|
|
|
}
|
|
|
Page<SysUser> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
|
|
|
IPage<SysUser> sysUsers = this.page(page, queryWrapper);
|