bug修改

无关风月

2025-02-28 2f8e70ad2884d2b6b7443dfae0af11ae9cfc8b99

 manage/src/main/java/com/jilongda/manage/authority/service/impl/SecUserServiceImpl.java

@@ -56,8 +56,6 @@
    private PasswordEncoder passwordEncoder;
    @Autowired
    private SecRoleMapper secRoleMapper;
    @Autowired
    private TDeptMapper deptMapper;

    @Override
    public List<SecResourceVO> selectUserResourcesTag(Long uid) {
@@ -137,26 +135,19 @@
     */
    @Override
    public PageInfo<SecUsersVO> getSysUserList(SecUsersDTO dto) {

        if (dto.getPageSize() > 500) {
            long count = this.count();
            dto.setPageSize(Math.toIntExact(count));
        }

        PageInfo<SecUsersVO> pageInfo = new PageInfo<>(dto.getPageNum(), dto.getPageSize());
        // 查询角色
        List<SecUsersVO> sysUserListVOS = secUserMapper.getSecUserList(dto, pageInfo);
        List<SecRole> secRoles = secRoleMapper.selectList(Wrappers.lambdaQuery(SecRole.class));
//        List<SecRole> secRoles = secRoleMapper.selectList(Wrappers.lambdaQuery(SecRole.class));

        List<TDept> tDepts = deptMapper.selectList(Wrappers.lambdaQuery(TDept.class));

        for (SecUsersVO sysUserListVO : sysUserListVOS) {
            List<SecRole> roles = secRoles.stream().filter(role -> Objects.nonNull(sysUserListVO.getRoleId()) && sysUserListVO.getRoleId().equals(role.getId())).collect(toList());
            sysUserListVO.setSecRole(CollectionUtils.isNotEmpty(roles) ? roles.get(0) : null);
            tDepts.stream().filter(dept -> Objects.nonNull(sysUserListVO.getDeptId()) && sysUserListVO.getDeptId().equals(dept.getId())).forEach(dept -> {
                sysUserListVO.setDeptName(dept.getDeptName());
            });
        }
//        for (SecUsersVO sysUserListVO : sysUserListVOS) {
//            List<SecRole> roles = secRoles.stream().filter(role -> Objects.nonNull(sysUserListVO.getRoleId()) && sysUserListVO.getRoleId().equals(role.getId())).collect(toList());
//            sysUserListVO.setSecRole(CollectionUtils.isNotEmpty(roles) ? roles.get(0) : null);
//            tDepts.stream().filter(dept -> Objects.nonNull(sysUserListVO.getDeptId()) && sysUserListVO.getDeptId().equals(dept.getId())).forEach(dept -> {
//                sysUserListVO.setDeptName(dept.getDeptName());
//            });
//        }
        pageInfo.setRecords(sysUserListVOS);
        // 获取列表
        return pageInfo;
@@ -172,6 +163,7 @@
                throw new ServiceException("该账号已存在，请勿重复注册");
            }
            dto.setAccount(dto.getPhone());
            dto.setUserType(3);
            dto.setLastLoginTime(LocalDateTime.now());
            if (StringUtils.hasLength(dto.getPassword())) {
                dto.setPassword(passwordEncoder.encode(dto.getPassword()));