Merge remote-tracking branch 'origin/master'

rentaiming

2024-06-21 f8f263f9149586e9694559a79a8a6f74128b144a

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

@@ -553,8 +553,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,7 +584,7 @@
        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")
                ), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "04")
                .eq(SysUser::getDelFlag, "0")
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        if (StringUtils.isEmpty(page.getRecords())) {
@@ -599,23 +600,30 @@
     */
    @Override
    public void saveSupplier(SupplierDTO dto) {

        SysUser user = BeanUtils.copyBean(dto, SysUser.class);
        boolean b = checkPhoneUnique(user);
        if (!b) {
            throw new ServiceException("该手机号已存在");
        }
        // 添加
        if (StringUtils.isNull(dto.getUserId())) {
            SysUser user = BeanUtils.copyBean(dto, SysUser.class);
            user.setUserName(dto.getPhonenumber());
            user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            user.setUserType("03");
            user.setUserType("04");
            this.save(user);
        } else {
            // 编辑
            SysUser user = this.getById(dto.getUserId());
            user = this.getById(dto.getUserId());
            if (StringUtils.isNull(user)) {
                throw new ServiceException("供应商不存在");
            }
            user.setNickName(dto.getNickName());
            user.setPhonenumber(dto.getPhonenumber());
            user.setUserName(dto.getPhonenumber());
            user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            if (StringUtils.isNotBlank(dto.getPassword())) {
                user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            }
            this.updateById(user);
        }
    }