update

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -16,7 +18,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.PermissionData;
-import org.jeecg.common.base.BaseMap;
 import org.jeecg.common.config.TenantContext;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.SymbolConstant;
@@ -47,8 +48,6 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -107,6 +106,7 @@ public class SysUserController {
 
     /**
      * 获取租户下用户数据（支持租户隔离）
+     *
      * @param user
      * @param pageNo
      * @param pageSize
@@ -239,6 +239,7 @@ public class SysUserController {
 
     /**
      * 冻结&解冻用户
+     *
      * @param jsonObject
      * @return
      */
@@ -431,6 +432,7 @@ public class SysUserController {
 
     /**
      * 用户选择组件 专用  根据用户账号或部门分页查询
+     *
      * @param departId
      * @param username
      * @return
@@ -569,9 +571,9 @@ public class SysUserController {
     }
 
     /**
-	 * @功能：根据id 批量查询
      * @param userIds
      * @return
+     * @功能：根据id 批量查询
      */
     @RequestMapping(value = "/queryByIds", method = RequestMethod.GET)
     public Result<Collection<SysUser>> queryByIds(@RequestParam(name = "userIds") String userIds) {
@@ -586,9 +588,9 @@ public class SysUserController {
 
 
     /**
-     * @功能：根据id 批量查询
      * @param userNames
      * @return
+     * @功能：根据id 批量查询
      */
     @RequestMapping(value = "/queryByNames", method = RequestMethod.GET)
     public Result<Collection<SysUser>> queryByNames(@RequestParam(name = "userNames") String userNames) {
@@ -634,7 +636,8 @@ public class SysUserController {
         Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
         String roleId = req.getParameter("roleId");
         String username = req.getParameter("username");
-        IPage<SysUser> pageList = sysUserService.getUserByRoleId(page,roleId,username);
+        String roleCode = req.getParameter("roleCode");
+        IPage<SysUser> pageList = sysUserService.getUserByRoleId(page, roleId, username, roleCode);
         result.setSuccess(true);
         result.setResult(pageList);
         return result;
@@ -673,8 +676,10 @@ public class SysUserController {
             return result;
         }
     }
+
     /**
      * 删除指定角色的用户关系
+     *
      * @param
      * @return
      */
@@ -917,6 +922,7 @@ public class SysUserController {
 
     /**
      * 查询当前用户的所有部门/当前部门编码
+     *
      * @return
      */
     @RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET)
@@ -938,8 +944,6 @@ public class SysUserController {
     }
 
 
-
-
     /**
      * 用户注册接口
      *
@@ -1191,6 +1195,7 @@ public class SysUserController {
 
     /**
      * 【APP端接口】获取用户列表  根据用户名和真实名 模糊匹配
+     *
      * @param keyword
      * @param pageNo
      * @param pageSize
@@ -1283,6 +1288,7 @@ public class SysUserController {
 
     /**
      * 移动端修改用户信息
+     *
      * @param jsonObject
      * @return
      */
@@ -1347,8 +1353,10 @@ public class SysUserController {
         }
         return result;
     }
+
     /**
      * 移动端保存设备信息
+     *
      * @param clientId
      * @return
      */
@@ -1370,6 +1378,7 @@ public class SysUserController {
         }
         return result;
     }
+
     /**
      * 根据userid获取用户信息和部门员工信息
      *
@@ -1394,8 +1403,10 @@ public class SysUserController {
         }
         return Result.ok(map);
     }
+
     /**
      * 移动端查询部门用户信息
+     *
      * @param departId
      * @return
      */
@@ -1408,8 +1419,10 @@ public class SysUserController {
         result.setResult(childrenUser);
         return result;
     }
+
     /**
      * 移动端查询用户信息(通过用户名模糊查询)
+     *
      * @param keyword
      * @return
      */
@@ -1462,6 +1475,7 @@ public class SysUserController {
 
     /**
      * 根据用户名修改手机号[该方法未使用]
+     *
      * @param json
      * @return
      */
@@ -1503,6 +1517,7 @@ public class SysUserController {
 
     /**
      * 根据对象里面的属性值作in查询 属性可能会变 用户组件用到
+     *
      * @param sysUser
      * @return
      */
@@ -1522,6 +1537,7 @@ public class SysUserController {
 
     /**
      * 聊天 创建聊天组件专用  根据用户账号、用户姓名、部门id分页查询
+     *
      * @param departId 部门id
      * @param keyword  搜索值
      * @return
@@ -1545,6 +1561,7 @@ public class SysUserController {
 
     /**
      * 简版流程用户选择组件
+     *
      * @param departId 部门id
      * @param roleId   角色id
      * @param keyword  搜索值
@@ -1574,6 +1591,7 @@ public class SysUserController {
 
     /**
      * 用户离职(新增代理人和用户状态变更操作)【低代码应用专用接口】
+     *
      * @param sysUserAgent
      * @return
      */
@@ -1611,6 +1629,7 @@ public class SysUserController {
 
     /**
      * 更新刪除状态和离职状态【低代码应用专用接口】
+     *
      * @param jsonObject
      * @return Result<String>
      */
@@ -1634,6 +1653,7 @@ public class SysUserController {
 
     /**
      * 获取用户信息(vue3用户设置专用)【低代码应用专用接口】
+     *
      * @return
      */
     @GetMapping("/login/setting/getUserData")
@@ -1673,6 +1693,7 @@ public class SysUserController {
 
     /**
      * 用户编辑(vue3用户设置专用)【低代码应用专用接口】
+     *
      * @param sysUser
      * @return
      */
@@ -1693,6 +1714,7 @@ public class SysUserController {
 
     /**
      * 批量修改 【low-app】
+     *
      * @param jsonObject
      * @return
      */
@@ -1712,6 +1734,7 @@ public class SysUserController {
 
     /**
      * 根据关键词搜索部门和用户【low-app】
+     *
      * @param keyword
      * @return
      */
@@ -1723,6 +1746,7 @@ public class SysUserController {
 
     /**
      * 编辑部门前获取部门相关信息 【low-app】
+     *
      * @param id
      * @return
      */
@@ -1734,6 +1758,7 @@ public class SysUserController {
 
     /**
      * 编辑部门 【low-app】
+     *
      * @param updateDepartInfo
      * @return
      */
@@ -1745,6 +1770,7 @@ public class SysUserController {
 
     /**
      * 设置负责人 取消负责人
+     *
      * @param json
      * @return
      */
@@ -1756,6 +1782,7 @@ public class SysUserController {
 
     /**
      * 修改租户下的用户【低代码应用专用接口】
+     *
      * @param sysUser
      * @param req
      * @return
@@ -1782,6 +1809,7 @@ public class SysUserController {
     /**
      * 切换租户时 需要修改 loginTenantId
      * QQYUN-4491 【应用】一些小问题  1、上次选中登录的租户，下次登录未记忆
+     *
      * @param sysUser
      * @return
      */
@@ -1812,6 +1840,7 @@ public class SysUserController {
 
     /**
      * 应用用户导出
+     *
      * @param request
      * @return
      */
@@ -1822,6 +1851,7 @@ public class SysUserController {
 
     /**
      * 应用用户导入
+     *
      * @param request
      * @return
      */

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -76,7 +76,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param username 用户登录账户
 	 * @return
 	 */
-	IPage<SysUser> getUserByRoleId(Page page, @Param("roleId") String roleId, @Param("username") String username);
+	IPage<SysUser> getUserByRoleId(Page page, @Param("roleId") String roleId, @Param("username") String username, @Param("roleCode") String roleCode);
 	
 	/**
 	 * 根据用户名设置部门ID

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -14,7 +14,8 @@
 
     <!-- 根据部门Id查询 -->
     <select id="getUserByDepId" resultType="org.jeecg.modules.system.entity.SysUser">
-		select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_depart where dep_id=#{departId})
+        select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_depart where
+        dep_id=#{departId})
         <if test="username!=null and username!=''">
             and username = #{username}
         </if>
@@ -25,7 +26,8 @@
         <if test="orgCode != null">
             <bind name="bindOrgCode" value="orgCode+'%'"/>
         </if>
-		select username from sys_user where del_flag = 0 and id in (select user_id from sys_user_depart where dep_id in (select id from sys_depart where org_code LIKE #{bindOrgCode}))
+        select username from sys_user where del_flag = 0 and id in (select user_id from sys_user_depart where dep_id in
+        (select id from sys_depart where org_code LIKE #{bindOrgCode}))
     </select>
 
     <!-- 查询用户的所属部门名称信息 -->
@@ -53,10 +55,18 @@
 
     <!-- 根据角色Id查询 -->
     <select id="getUserByRoleId" resultType="org.jeecg.modules.system.entity.SysUser">
-		select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_role where role_id=#{roleId})
+        select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_role where 1=1
-		<if test="username!=null and username!=''">
+        <if test="roleId!=null and roleId!=''">
-			and username = #{username}
+            and role_id = #{roleId}
         </if>
+        <if test="roleCode!=null and roleCode!=''">
+            and role_code = #{roleCode}
+        </if>
+        )
+        <if test="username!=null and username!=''">
+            and username = #{roleCode}
+        </if>
+
     </select>
 
     <!--  修改用户部门code -->
@@ -131,7 +141,8 @@
 
     <!-- 查询 getUserByOrgCode 的总数-->
     <select id="getUserByOrgCodeTotal" resultType="java.lang.Integer">
-		SELECT COUNT(1) <include refid="getUserByOrgCodeFromSql"/>
+        SELECT COUNT(1)
+        <include refid="getUserByOrgCodeFromSql"/>
     </select>
 
     <!-- 批量删除角色的与用户关系-->

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -177,7 +177,7 @@ public interface ISysUserService extends IService<SysUser> {
      * @param username 用户账户名称
 	 * @return
 	 */
-	public IPage<SysUser> getUserByRoleId(Page<SysUser> page, String roleId, String username);
+	public IPage<SysUser> getUserByRoleId(Page<SysUser> page, String roleId, String username,String roleCode);
 
 	/**
 	 * 通过用户名获取用户角色集合

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -551,9 +551,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @return
      */
 	@Override
-	public IPage<SysUser> getUserByRoleId(Page<SysUser> page, String roleId, String username) {
+	public IPage<SysUser> getUserByRoleId(Page<SysUser> page, String roleId, String username,String roleCode) {
 		//update-begin---author:wangshuai ---date:20230220  for：[QQYUN-3980]组织管理中 职位功能 职位表加租户id 加职位-用户关联表------------
-		IPage<SysUser> userRoleList = userMapper.getUserByRoleId(page, roleId, username);
+		IPage<SysUser> userRoleList = userMapper.getUserByRoleId(page, roleId, username,roleCode);
 		List<SysUser> records = userRoleList.getRecords();
 		if (null != records && records.size() > 0) {
 			List<String> userIds = records.stream().map(SysUser::getId).collect(Collectors.toList());