update

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>
 
     <!-- 批量删除角色的与用户关系-->
@@ -167,7 +178,7 @@
         WHERE
         del_flag = 1
         AND id IN
-			<foreach collection="userIds" item="userId" open="(" close=")" separator="," >
+        <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
             #{userId}
         </foreach>
     </update>
@@ -175,7 +186,7 @@
     <!-- 彻底删除被逻辑删除的用户 -->
     <delete id="deleteLogicDeleted">
         DELETE FROM sys_user WHERE del_flag = 1 AND id IN
-		<foreach collection="userIds" item="userId" open="(" close=")" separator="," >
+        <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
             #{userId}
         </foreach>
     </delete>
@@ -277,7 +288,7 @@
         WHERE
         del_flag = 1
         AND id IN
-    <foreach collection="userIds" item="userId" open="(" close=")" separator="," >
+        <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
             #{userId}
         </foreach>
     </update>

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());