bug修改

mitao

2025-03-14 392b42c4891cf2e6beda57ab32c51598f290f4b7

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -28,6 +28,7 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
@@ -474,7 +475,7 @@
//            checkUserDataScope(userId);
        }
        // 删除用户与角色关联
//        userRoleMapper.deleteUserRole(userIds);
        userRoleMapper.deleteUserRole(userIds);
//        // 删除用户与岗位关联
//        userPostMapper.deleteUserPost(userIds);
        return userMapper.deleteUserByIds(userIds);
@@ -553,8 +554,9 @@
    }

    @Override
    public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, String phonenumber) {
        return this.baseMapper.getList(pageInfo,phonenumber);
    public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, String nickName,
            String phonenumber, Integer status) {
        return this.baseMapper.getList(pageInfo, nickName, phonenumber, status);
    }

    @Override
@@ -583,8 +585,8 @@
        Page<SysUser> page = this.lambdaQuery()
                .select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber)
                .like(StringUtils.isNotBlank(query.getNickName()
                ), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "03")
                .eq(SysUser::getDelFlag, "0")
                ), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "04")
                .eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        if (StringUtils.isEmpty(page.getRecords())) {
            return PageDTO.empty(page);
@@ -602,21 +604,37 @@
        // 添加
        if (StringUtils.isNull(dto.getUserId())) {
            SysUser user = BeanUtils.copyBean(dto, SysUser.class);
            boolean b = checkPhoneUnique(user);
            if (!b) {
                throw new ServiceException("该手机号已存在");
            }
            user.setUserName(dto.getPhonenumber());
            user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            user.setUserType("03");
            user.setUserType("04");
            user.setCreateTime(new Date());
            user.setCreateBy(SecurityUtils.getUsername());
            this.save(user);
        } else {
            // 编辑
            SysUser user = this.getById(dto.getUserId());
            if (StringUtils.isNull(user)) {
            SysUser userUpd = this.getById(dto.getUserId());
            if (StringUtils.isNull(userUpd)) {
                throw new ServiceException("供应商不存在");
            }
            user.setNickName(dto.getNickName());
            user.setPhonenumber(dto.getPhonenumber());
            user.setUserName(dto.getPhonenumber());
            user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            this.updateById(user);
            userUpd.setNickName(dto.getNickName());
            userUpd.setUpdateTime(new Date());
            userUpd.setUpdateBy(SecurityUtils.getUsername());
            if (StringUtils.isNotBlank(dto.getPassword())) {
                userUpd.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            }
            if (!userUpd.getPhonenumber().equals(dto.getPhonenumber())) {
                userUpd.setPhonenumber(dto.getPhonenumber());
                userUpd.setUserName(dto.getPhonenumber());
                boolean b = checkPhoneUnique(userUpd);
                if (!b) {
                    throw new ServiceException("该手机号已存在");
                }
            }
            this.updateById(userUpd);
        }
    }