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 47c90f0b..7b930220 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 @@ -114,16 +114,22 @@ public class SysUserController { IPage pageList = sysUserService.queryPage(page, subDepIds, queryWrapper); + //批量查询用户的所属部门 //step.1 先拿到全部的 useids - //step.2 通过 useids,一次性查询用户的所属部门名字 List userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList()); if(userIds!=null && userIds.size()>0){ + //step.2 通过 useids,一次性查询用户的所属部门名字 Map useDepNames = sysUserService.getDepNamesByUserIds(userIds); + //step.3 通过 useids,一次性查询用户的角色名字 + Map useRoleNames = sysUserService.getRoleNamesByUserIds(userIds); + //step.4 遍历赋值 pageList.getRecords().forEach(item->{ item.setOrgCodeTxt(useDepNames.get(item.getId())); + item.setRoleTxt(useRoleNames.get(item.getId())); }); } + result.setSuccess(true); result.setResult(pageList); log.info(pageList.toString()); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java index 6023ec44..fec3ef8e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java @@ -105,6 +105,9 @@ public class SysUser implements Serializable { /**部门名称*/ private transient String orgCodeTxt; + /**角色名称*/ + private transient String roleTxt; + /** * 状态(1:正常 2:冻结 ) */ diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index 3ab71d3f..64824039 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -4,11 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.system.vo.SysUserRoleNameVo; import org.apache.ibatis.annotations.Param; import com.jero.modules.system.entity.SysUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.system.model.SysUserSysDepartModel; -import com.jero.modules.system.vo.SysUserDepVo; +import com.jero.modules.system.vo.SysUserDepNameVo; import java.util.List; @@ -48,7 +49,14 @@ public interface SysUserMapper extends BaseMapper { * @param userIds * @return */ - List getDepNamesByUserIds(@Param("userIds")List userIds); + List getDepNamesByUserIds(@Param("userIds")List userIds); + + /** + * 根据用户Ids,查询用户角色名称信息 + * @param userIds + * @return + */ + List getRoleNamesByUserIds(@Param("userIds")List userIds); /** * 根据部门Ids,查询部门下用户信息 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index c901be15..9fee9d04 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -36,13 +36,21 @@ - select d.depart_name,ud.user_id from sys_user_depart ud,sys_depart d where d.id = ud.dep_id and ud.user_id in #{id} + + +