查询user对象时，取消User对象本身的role值，改为查询一对多的中间表值

src/main/java/com/sfa/system/controller/core/SysUserCoreController.java

@@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Objects;
+
 /**
  * @author : liqiulin
  * @date : 2024-10-30 17
@@ -52,11 +54,14 @@ public class SysUserCoreController {
     @PutMapping
     public void edit(@Validated @RequestBody UserVo userVo) {
         deptDao.checkDeptDataScope(userVo.getDeptId());
-        roleDao.checkRoleDataScope(userVo.getRoleId());
+        roleDao.checkRoleDataScope(userVo.getRoleIds());
         userVo.setUpdateUserId(SecurityUtils.getUserId());
         userVo.setUpdateBy(SecurityUtils.getUsername());
         sysUserService.updateUser(userVo);
 
+        if (Objects.isNull(userVo.getPrivilegeId())){
+            return;
+        }
         // 开通促销账号
         sysUserService.openPromotion(userVo);
     }

src/main/java/com/sfa/system/controller/query/SysUserQueryController.java

 package com.sfa.system.controller.query;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.sfa.common.core.domain.R;
 import com.sfa.common.core.utils.StringUtils;
 import com.sfa.common.core.utils.poi.ExcelUtil;
@@ -33,6 +34,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -44,8 +46,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/user")
-public class SysUserQueryController extends BaseController
-{
+public class SysUserQueryController extends BaseController {
     @Autowired
     private ISysUserDao userDao;
 
@@ -72,16 +73,14 @@ public class SysUserQueryController extends BaseController
      */
     @RequiresPermissions("system:user:list")
     @GetMapping("/list")
-    public PageInfo list(UserVo userVo)
-    {
+    public PageInfo list(UserVo userVo) {
         return userQueryService.selectUserPage(userVo);
     }
 
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @RequiresPermissions("system:user:export")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysUser user)
-    {
+    public void export(HttpServletResponse response, SysUser user) {
         List<SysUser> list = userDao.selectUserList(user);
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.exportExcel(response, list, "用户数据");
@@ -90,8 +89,7 @@ public class SysUserQueryController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @RequiresPermissions("system:user:import")
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         List<SysUser> userList = util.importExcel(file.getInputStream());
         String operName = SecurityUtils.getUsername();
@@ -100,8 +98,7 @@ public class SysUserQueryController extends BaseController
     }
 
     @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response) throws IOException
-    {
+    public void importTemplate(HttpServletResponse response) throws IOException {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.importTemplateExcel(response, "用户数据");
     }
@@ -111,11 +108,9 @@ public class SysUserQueryController extends BaseController
      */
     @InnerAuth
     @GetMapping("/info/{username}")
-    public R<LoginUser> info(@PathVariable("username") String username)
-    {
+    public R<LoginUser> info(@PathVariable("username") String username) {
         SysUser sysUser = userDao.selectUserByUserName(username);
-        if (StringUtils.isNull(sysUser))
-        {
+        if (StringUtils.isNull(sysUser)) {
             return R.fail("用户名或密码错误");
         }
         // 角色集合
@@ -129,32 +124,41 @@ public class SysUserQueryController extends BaseController
         return R.ok(sysUserVo);
     }
 
+    @InnerAuth
+    @GetMapping("/userInfoById")
+    public R<SysUser> userInfo(Long userId) {
+        SysUser user =new SysUser(userId);
+        List<SysUser> list = userDao.selectUserList(user);
+        if(ObjectUtil.isEmpty(list)){
+            return R.fail("用户名或密码错误");
+        }
+        SysUser sysUser = list.get(0);
+        return R.ok(sysUser);
+
+    }
+
     /**
      * 注册用户信息
      */
     @InnerAuth
     @PostMapping("/register")
-    public R<Boolean> register(@RequestBody SysUser sysUser)
-    {
+    public R<Boolean> register(@RequestBody SysUser sysUser) {
         String username = sysUser.getUserName();
-        if (!("true".equals(sysConfigDao.selectConfigByKey("sys.account.registerUser"))))
-        {
+        if (!("true".equals(sysConfigDao.selectConfigByKey("sys.account.registerUser")))) {
             return R.fail("当前系统没有开启注册功能！");
         }
-        if (!userDao.checkUserNameUnique(sysUser))
-        {
+        if (!userDao.checkUserNameUnique(sysUser)) {
             return R.fail("保存用户'" + username + "'失败，注册账号已存在");
         }
         return R.ok(userDao.registerUser(sysUser));
     }
 
     /**
-     *记录用户登录IP地址和登录时间
+     * 记录用户登录IP地址和登录时间
      */
     @InnerAuth
     @PutMapping("/recordlogin")
-    public R<Boolean> recordlogin(@RequestBody SysUser sysUser)
-    {
+    public R<Boolean> recordlogin(@RequestBody SysUser sysUser) {
         return R.ok(userDao.updateUserProfile(sysUser));
     }
 
@@ -164,8 +168,7 @@ public class SysUserQueryController extends BaseController
      * @return 用户信息
      */
     @GetMapping("/getInfo")
-    public AjaxResult getInfo()
-    {
+    public AjaxResult getInfo() {
         SysUser user = userDao.selectUserById(SecurityUtils.getUserId());
         UserDto userDto = new UserDto();
         BeanUtils.copyProperties(user, userDto);
@@ -191,20 +194,20 @@ public class SysUserQueryController extends BaseController
      * 根据用户编号获取详细信息
      */
     @RequiresPermissions("system:user:query")
-    @GetMapping(value = { "/", "/{userId}" })
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
-    {
+    @GetMapping(value = {"/", "/{userId}"})
+    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
         userDao.checkUserDataScope(userId);
         AjaxResult ajax = AjaxResult.success();
         List<SysRole> roles = sysRoleDao.selectRoleAll();
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", sysPostDao.selectPostAll());
-        if (StringUtils.isNotNull(userId))
-        {
+        if (StringUtils.isNotNull(userId)) {
             SysUser sysUser = userDao.selectUserById(userId);
             UserDto userDto = new UserDto();
             BeanUtils.copyProperties(sysUser, userDto);
             SysUserProDto sysUserProDto = userQueryService.selectUserPromotion(userDto);
+            List<Long> roleIds = sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList());
+            userDto.setRoleIds(roleIds.toArray(new Long[0]));
             userDto.setIsOpenPromotion(sysUserProDto != null);
             if (userDto.getIsOpenPromotion()) {
                 userDto.setPrivilegeId(sysUserProDto.getPrivilegeId());
@@ -213,7 +216,7 @@ public class SysUserQueryController extends BaseController
 
             ajax.put(AjaxResult.DATA_TAG, userDto);
 //            ajax.put("postIds", sysPostDao.selectPostListByUserId(userId));
-//            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+
         }
         return ajax;
     }
@@ -222,8 +225,7 @@ public class SysUserQueryController extends BaseController
      * 新增用户
      @RequiresPermissions("system:user:add")
      @Log(title = "用户管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@Validated @RequestBody UserVo userVo)
+     @PostMapping public AjaxResult add(@Validated @RequestBody UserVo userVo)
      {
      sysDeptDao.checkDeptDataScope(userVo.getDeptId());
      sysRoleDao.checkRoleDataScope(userVo.getRoleIds());
@@ -251,8 +253,7 @@ public class SysUserQueryController extends BaseController
 
      @RequiresPermissions("system:user:edit")
      @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysUser user)
+     @PutMapping public AjaxResult edit(@Validated @RequestBody SysUser user)
      {
      userDao.checkUserAllowed(user);
      userDao.checkUserDataScope(user.getUserId());
@@ -282,10 +283,8 @@ public class SysUserQueryController extends BaseController
     @RequiresPermissions("system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
-    {
-        if (ArrayUtils.contains(userIds, SecurityUtils.getUserId()))
-        {
+    public AjaxResult remove(@PathVariable Long[] userIds) {
+        if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) {
             return error("当前用户不能删除");
         }
         return toAjax(userDao.deleteUserByIds(userIds));
@@ -297,8 +296,7 @@ public class SysUserQueryController extends BaseController
     @RequiresPermissions("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
-    public AjaxResult resetPwd(@RequestBody SysUser user)
-    {
+    public AjaxResult resetPwd(@RequestBody SysUser user) {
         userDao.checkUserAllowed(user.getUserId());
         userDao.checkUserDataScope(user.getUserId());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -312,8 +310,7 @@ public class SysUserQueryController extends BaseController
     @RequiresPermissions("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysUser user)
-    {
+    public AjaxResult changeStatus(@RequestBody SysUser user) {
         userDao.checkUserAllowed(user.getUserId());
         userDao.checkUserDataScope(user.getUserId());
         user.setUpdateBy(SecurityUtils.getUsername());
@@ -325,8 +322,7 @@ public class SysUserQueryController extends BaseController
      */
     @RequiresPermissions("system:user:query")
     @GetMapping("/authRole/{userId}")
-    public AjaxResult authRole(@PathVariable("userId") Long userId)
-    {
+    public AjaxResult authRole(@PathVariable("userId") Long userId) {
         AjaxResult ajax = AjaxResult.success();
         SysUser user = userDao.selectUserById(userId);
         List<SysRole> roles = sysRoleDao.selectRolesByUserId(userId);
@@ -341,8 +337,7 @@ public class SysUserQueryController extends BaseController
     @RequiresPermissions("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
-    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
-    {
+    public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
         userDao.checkUserDataScope(userId);
         sysRoleDao.checkRoleDataScope(roleIds);
         userDao.insertUserAuth(userId, roleIds);
@@ -354,8 +349,7 @@ public class SysUserQueryController extends BaseController
      */
     @RequiresPermissions("system:user:list")
     @GetMapping("/deptTree")
-    public AjaxResult deptTree(SysDept dept)
-    {
+    public AjaxResult deptTree(SysDept dept) {
         return success(sysDeptDao.selectDeptTreeList(dept));
     }
 }

src/main/java/com/sfa/system/domain/dao/impl/SysMenuDaoImpl.java

@@ -58,7 +58,8 @@ public class SysMenuDaoImpl implements ISysMenuDao
 
     /**
      * 查询系统菜单列表
-     * 
+     * 只有admin超管一个账号可以进行角色-菜单管理
+     * 【其他账号登录只能看到自己角色的菜单的逻辑】被注视，不可使用。
      * @param menu 菜单信息
      * @return 菜单列表
      */

src/main/java/com/sfa/system/domain/dao/impl/SysUserDaoImpl.java

@@ -254,17 +254,13 @@ public class SysUserDaoImpl implements ISysUserDao {
 
         SysUser user = new SysUser();
         BeanUtils.copyProperties(userVo, user);
-        // 补充角色
-        SysRole sysRole = roleMapper.selectById(user.getRoleId());
-        user.setRoleName(sysRole.getRoleName());
-
         // 新增用户信息
         int rows = userMapper.insert(user);
         // 新增用户岗位关联
 //            insertUserPost(user);
         // 新增用户与角色管理
-//        insertUserRole(user);
-        insertUserRoleOne(user.getUserId(), user.getRoleId());
+        insertUserRole(user);
+//        insertUserRoleOne(user.getUserId(), user.getRoleId());
         return rows;
     }
 
@@ -319,11 +315,11 @@ public class SysUserDaoImpl implements ISysUserDao {
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userVo.getUserId());
         // 新增用户与角色管理
-//        insertUserRole(user);
-        insertUserRoleOne(user.getUserId(), user.getRoleId());
+        insertUserRole(user);
         user.setPassword(null);
-        userMapper.updateById(user);
-        return userMapper.updateRoleName(user);
+        return userMapper.updateById(user);
+//        insertUserRoleOne(user.getUserId(), user.getRoleId());
+//        return userMapper.updateRoleName(user);
     }
 
     /**
@@ -551,37 +547,8 @@ public class SysUserDaoImpl implements ISysUserDao {
 
     @Override
     public PageInfo selectUserPage(SysUserWq sysUserWq) {
-        LambdaQueryWrapper<SysUser> qw = buildWrapper(sysUserWq);
-        Page<SysUser> pageR = userMapper.selectPage(TableSupport.pageI(), qw);
+        Page<SysUser> pageR = userMapper.selectUserPage(TableSupport.pageI(), sysUserWq);
         PageInfo<SysUser> pageInfo = new PageInfo<>(pageR);
         return pageInfo;
     }
-
-
-    private LambdaQueryWrapper<SysUser> buildWrapper(SysUserWq sysUserWq) {
-        LambdaQueryWrapper<SysUser> qw = new LambdaQueryWrapper<>();
-        qw.eq(SysUser::getDelFlag, "0");
-        if (StringUtils.isNotBlank(sysUserWq.getStatus())) {
-            qw.eq(SysUser::getStatus, sysUserWq.getStatus());
-        }
-        if (Objects.nonNull(sysUserWq.getRoleId())) {
-            qw.eq(SysUser::getRoleId, sysUserWq.getRoleId());
-        }
-        if (Objects.nonNull(sysUserWq.getDeptId())) {
-            qw.eq(SysUser::getDeptId, sysUserWq.getDeptId());
-        }
-        if (Objects.nonNull(sysUserWq.getBeginTime())&&Objects.nonNull(sysUserWq.getEndTime())){
-            qw.between(SysUser::getCreateTime, sysUserWq.getBeginTime(),sysUserWq.getEndTime());
-        }
-        if (Objects.nonNull(sysUserWq.getExistRole()) && !sysUserWq.getExistRole()){
-            qw.isNull(SysUser::getRoleId);
-        }
-        if (StringUtils.isNotBlank(sysUserWq.getUserNameLike())) {
-            qw.like(SysUser::getUserName, sysUserWq.getUserNameLike());
-        }
-        if (StringUtils.isNotBlank(sysUserWq.getPhonenumberLike())) {
-            qw.like(SysUser::getPhonenumber, sysUserWq.getPhonenumberLike());
-        }
-        return qw;
-    }
 }

src/main/java/com/sfa/system/domain/mapper/SysUserMapper.java

@@ -3,6 +3,8 @@ package com.sfa.system.domain.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sfa.system.domain.wq.SysUserWq;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.sfa.system.api.domain.SysUser;
@@ -131,9 +133,11 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      */
     public SysUser checkEmailUnique(String email);
 
-    List<SysUser> selectUserPage();
+//    List<SysUser> selectUserPage();
 
     void updateUserPostByPostId(@Param("postId") Long postId, @Param("postName") String postName, @Param("ruleId") Long ruleId, @Param("ruleName") String ruleName);
 
     int updateRoleName(SysUser user);
+
+    Page<SysUser> selectUserPage(Page<SysUser> page, @Param("sysUserWq") SysUserWq sysUserWq);
 }

src/main/java/com/sfa/system/domain/wq/SysUserWq.java

@@ -18,6 +18,7 @@ public class SysUserWq {
     private String phonenumber;
 
     private String userNameLike;
+    private String nickNameLike;
 
     private String phonenumberLike;
 

src/main/java/com/sfa/system/service/query/impl/UserQueryServiceImpl.java

@@ -33,6 +33,7 @@ public class UserQueryServiceImpl implements IUserQueryService {
         SysUserWq sysUserWq = new SysUserWq();
         BeanUtils.copyProperties(userVo,sysUserWq);
         sysUserWq.setUserNameLike(userVo.getUserName())
+                .setNickNameLike(userVo.getNickName())
                 .setPhonenumberLike(userVo.getPhonenumber());
 
         return userDao.selectUserPage(sysUserWq);

src/main/resources/bootstrap-master.yml

+spring:
+  application:
+    name: wangxiaolu-sfa-system
+
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.0.0.170:8848
+        group: sfa
+        namespace: e2996044-6ddc-4988-8810-602e05d01ccf
+      config:
+        server-addr: 10.0.0.170:8848
+        file-extension: yaml
+        group: sfa
+        namespace: e2996044-6ddc-4988-8810-602e05d01ccf

src/main/resources/mapper/system/SysUserMapper.xml

@@ -24,8 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
 
-		<result property="roleId"       column="role_id"       />
-		<result property="roleName"       column="role_name"       />
+<!--		<result property="roleId"       column="role_id"       />-->
+<!--		<result property="roleName"       column="role_name"       />-->
 		<result property="workProvinceNum"       column="work_province_num"       />
 		<result property="workProvinceName"       column="work_province_name"       />
 		<result property="workCityNum"       column="work_city_num"       />
@@ -58,9 +58,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"       column="role_status"    />
     </resultMap>
 
+<!--	u.role_id,u.role_name,-->
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name,u.password, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-               u.role_id,u.role_name,u.post_id,u.post_name,u.rule_id,u.rule_name,u.work_province_num,u.work_province_name,u.work_city_num,u.work_city_name,
+               u.post_id,u.post_name,u.rule_id,u.rule_name,u.work_province_num,u.work_province_name,u.work_city_num,u.work_city_name,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -222,28 +223,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-	<select id="selectUserPage" parameterType="com.sfa.system.api.domain.SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
-		u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.post_id,u.post_name,u.rule_id,u.rule_name, d.dept_name, d.leader from sys_user
-		u
-		left join sys_dept d on u.dept_id = d.dept_id
-		where u.del_flag = '0'
-		<if test="userId != null and userId != 0">
-			AND u.user_id = #{userId}
+<!--	<select id="selectUserPage" parameterType="com.sfa.system.api.domain.SysUser" resultMap="SysUserResult">-->
+<!--		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,-->
+<!--		u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.post_id,u.post_name,u.rule_id,u.rule_name, d.dept_name, d.leader from sys_user-->
+<!--		u-->
+<!--		left join sys_dept d on u.dept_id = d.dept_id-->
+<!--		where u.del_flag = '0'-->
+<!--		<if test="userId != null and userId != 0">-->
+<!--			AND u.user_id = #{userId}-->
+<!--		</if>-->
+<!--		<if test="userName != null and userName != ''">-->
+<!--			AND u.user_name like concat('%', #{userName}, '%')-->
+<!--		</if>-->
+<!--		<if test="status != null and status != ''">-->
+<!--			AND u.status = #{status}-->
+<!--		</if>-->
+<!--		<if test="phonenumber != null and phonenumber != ''">-->
+<!--			AND u.phonenumber like concat('%', #{phonenumber}, '%')-->
+<!--		</if>-->
+<!--		<if test="deptId != null and deptId != 0">-->
+<!--			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>-->
+<!--	</select>-->
+
+
+	<select id="selectUserPage" resultType="com.sfa.system.api.domain.SysUser">
+		select *
+		from sys_user su
+		where del_flag = '0'
+		<if test="sysUserWq.status != null and sysUserWq.status != ''">
+			and su.status = #{sysUserWq.status}
 		</if>
-		<if test="userName != null and userName != ''">
-			AND u.user_name like concat('%', #{userName}, '%')
+		<if test="sysUserWq.deptId != null">
+			and su.dept_id = #{sysUserWq.deptId}
 		</if>
-		<if test="status != null and status != ''">
-			AND u.status = #{status}
+		<if test="sysUserWq.nickNameLike != null and sysUserWq.nickNameLike != ''">
+			and su.nick_name like concat('%',#{sysUserWq.nickNameLike},'%')
 		</if>
-		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		<if test="sysUserWq.userNameLike != null and sysUserWq.userNameLike != ''">
+			and su.user_name like concat('%',#{sysUserWq.userNameLike},'%')
 		</if>
-		<if test="deptId != null and deptId != 0">
-			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 test="sysUserWq.phonenumberLike != null and sysUserWq.phonenumberLike != ''">
+			and su.phonenumber like concat('%',#{sysUserWq.phonenumberLike},'%')
+		</if>
+		<if test="sysUserWq.beginTime != null and sysUserWq.endTime != null">
+			AND su.create_time BETWEEN #{sysUserWq.beginTime} AND #{sysUserWq.endTime}
 		</if>
+		<if test="sysUserWq.roleId != null">
+			<if test="sysUserWq.existRole != null and !sysUserWq.existRole">
+				and su.user_id not in (select user_id from sys_user_role where role_id = #{sysUserWq.roleId})
+			</if>
+			<if test="sysUserWq.existRole == null or sysUserWq.existRole">
+				and su.user_id in (select user_id from sys_user_role where role_id = #{sysUserWq.roleId})
+			</if>
+		</if>
+
 	</select>
 
 	<update id="updateUserPostByPostId">