代码提交 bug解决

无关风月

2024-09-03 56dfe0d4bf81262622a1919cceb2b039fd356209

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

@@ -22,10 +22,7 @@
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.domain.dto.ConservatorDTO;
import com.ruoyi.system.domain.dto.ConservatorQuery;
import com.ruoyi.system.domain.dto.SupplierDTO;
import com.ruoyi.system.domain.dto.SupplierQuery;
import com.ruoyi.system.domain.dto.*;
import com.ruoyi.system.domain.vo.ConservatorVO;
import com.ruoyi.system.domain.vo.SupplierVO;
import com.ruoyi.system.mapper.SysPostMapper;
@@ -620,14 +617,14 @@
     */
    @Override
    public void saveSupplier(SupplierDTO dto) {

        SysUser user = BeanUtils.copyBean(dto, SysUser.class);


        // 添加
        if (StringUtils.isNull(dto.getUserId())) {
            boolean b = checkPhoneUnique(user);
            if (!b) {
            List<SysUser> list = this.list(new QueryWrapper<SysUser>()
                    .eq("phonenumber", dto.getPhonenumber())
                            .eq("user_type","02")
                    .eq("del_flag", "0"));
            if (!list.isEmpty()) {
                throw new ServiceException("该手机号已存在");
            }
            user.setUserName(dto.getPhonenumber());
@@ -637,6 +634,14 @@
            user.setCreateBy(SecurityUtils.getUsername());
            this.save(user);
        } else {
            List<SysUser> list = this.list(new QueryWrapper<SysUser>()
                    .eq("phonenumber", dto.getPhonenumber())
                            .ne("user_id", dto.getUserId())
                    .eq("user_type","02")
                    .eq("del_flag", "0"));
            if (!list.isEmpty()) {
                throw new ServiceException("该手机号已存在");
            }
            // 编辑
            user = this.getById(dto.getUserId());
            if (StringUtils.isNull(user)) {
@@ -680,21 +685,55 @@

        return PageDTO.of(page1, ConservatorVO.class);
    }
    @Override
    public List<SysUser> getConservatorPage2(ConservatorQueryA query) {

        LambdaQueryWrapper<SysUser> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(SysUser::getUserType, "03");
        wrapper1.eq(SysUser::getDelFlag,"0");
        wrapper1.eq(SysUser::getRoleType,query.getGrade());
        if (org.springframework.util.StringUtils.hasLength(query.getTownCode())){
            wrapper1.eq(SysUser::getTownCode,query.getTownCode());
        }else if (org.springframework.util.StringUtils.hasLength(query.getCountyCode())){
            wrapper1.eq(SysUser::getCountyCode,query.getCountyCode());
        }else if (org.springframework.util.StringUtils.hasLength(query.getCityCode())){
            wrapper1.eq(SysUser::getCityCode,query.getCityCode());
        }
        List<SysUser> list = this.list(wrapper1);
        return list;
    }

    @Override
    public List<SysUser> getConservatorPage1() {
    public List<SysUser> getConservatorPage1(String grade) {
        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
        sysUserQueryWrapper.eq("del_flag",0);
        sysUserQueryWrapper.eq("user_type","03");
        if (grade!=null){
            sysUserQueryWrapper.eq("roleType",grade);
        }
        List<SysUser> page1 = this.list(sysUserQueryWrapper);

        return page1;
    }

    @Override
    public void saveConservator(ConservatorDTO dto) {
    public R saveConservator(ConservatorDTO dto) {
        SysUser user = BeanUtils.copyBean(dto, SysUser.class);

        QueryWrapper<SysUser> eq = new QueryWrapper<SysUser>()
                .ne("user_type", "02")
                .eq("phonenumber", dto.getPhonenumber())
                .eq("del_flag", "0");
        if (dto.getUserId()!=null){
            eq.ne("user_id", dto.getUserId());
        }
        SysUser one = this.getOne(eq);
        if (one!=null){
            if (one.getUserType().equals("00")){
                return R.fail("添加失败，该账号为平台账号");
            }else if (one.getUserType().equals("03")){
                return  R.fail("手机号已开通账号");
            }
        }
        // 添加
        if (StringUtils.isNull(dto.getUserId())) {
            boolean b = checkPhoneUnique(user);
@@ -705,7 +744,7 @@
            user.setUserName(dto.getPhonenumber());
            user.setUserType("03");
            user.setCreateTime(new Date());
            user.setPassword(SecurityUtils.encryptPassword("123456"));
            user.setPassword(SecurityUtils.encryptPassword("a123456"));
            user.setCreateBy(SecurityUtils.getUsername());
            user.setProvinceName(dto.getProvinceName());
            user.setProvinceCode(dto.getProvinceCode());
@@ -720,9 +759,11 @@
        } else {
            // 编辑
            user = this.getById(dto.getUserId());

            if (StringUtils.isNull(user)) {
                throw new ServiceException("管理员不存在");
            }

            user.setNickName(dto.getNickName());
            user.setPhonenumber(dto.getPhonenumber());
            user.setUserName(dto.getPhonenumber());
@@ -739,6 +780,7 @@
            user.setTownName(dto.getTownName());
            userMapper.updateHandle(user);
        }
        return R.ok();
    }