|
@@ -14,6 +14,7 @@ import com.usky.system.mapper.*;
|
|
|
import com.usky.system.model.LoginUser;
|
|
|
import com.usky.system.service.ISysConfigService;
|
|
|
import com.usky.system.service.ISysUserService;
|
|
|
+import com.usky.system.service.vo.SysUserNewVO;
|
|
|
import com.usky.system.service.vo.UserPostVo;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -92,28 +93,28 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
|
|
|
* @return 用户信息集合信息
|
|
|
*/
|
|
|
@Override
|
|
|
- public List<com.usky.system.service.vo.SysUserVO> dUserList(SysUser user) {
|
|
|
+ public List<SysUserNewVO> dUserList(SysUser user) {
|
|
|
user.setTenantId(SecurityUtils.getTenantId());
|
|
|
user.setUserType("00");
|
|
|
- List<com.usky.system.service.vo.SysUserVO> sysUserVOS = new ArrayList<>();
|
|
|
+ List<SysUserNewVO> sysUserNewVOS = new ArrayList<>();
|
|
|
List<SysUser> sysUsers = userMapper.selectUserList(user);
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
|
if (!sysUsers.isEmpty()) {
|
|
|
for (SysUser sysUser : sysUsers) {
|
|
|
- com.usky.system.service.vo.SysUserVO sysUserVO = new com.usky.system.service.vo.SysUserVO();
|
|
|
+ SysUserNewVO sysUserNewVO = new SysUserNewVO();
|
|
|
try {
|
|
|
- BeanUtils.copyProperties(sysUser, sysUserVO);
|
|
|
+ BeanUtils.copyProperties(sysUser, sysUserNewVO);
|
|
|
} catch (BeansException e) {
|
|
|
throw new BusinessException("dUserList方法,获取用户列表信息异常" + e);
|
|
|
}
|
|
|
userIds.add(sysUser.getUserId());
|
|
|
- sysUserVOS.add(sysUserVO);
|
|
|
+ sysUserNewVOS.add(sysUserNewVO);
|
|
|
}
|
|
|
Map<Long, String> userIdToPostMap = userPostMapper.getUserPost(userIds).stream()
|
|
|
.collect(Collectors.toMap(UserPostVo::getUserId, UserPostVo::getPostName));
|
|
|
- sysUserVOS.forEach(sysUserVO -> sysUserVO.setPost(userIdToPostMap.get(sysUserVO.getUserId())));
|
|
|
+ sysUserNewVOS.forEach(sysUserNewVO -> sysUserNewVO.setPost(userIdToPostMap.get(sysUserNewVO.getUserId())));
|
|
|
}
|
|
|
- return sysUserVOS;
|
|
|
+ return sysUserNewVOS;
|
|
|
}
|
|
|
|
|
|
/**
|