代码提交 bug解决

无关风月

2024-08-01 8876b1b9cd27fad076ea9e5f3e04197b84ba02bd

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

@@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -682,7 +683,10 @@

    @Override
    public List<SysUser> getConservatorPage1() {
        List<SysUser> page1 = this.list();
        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
        sysUserQueryWrapper.eq("del_flag",0);
        sysUserQueryWrapper.eq("user_type","03");
        List<SysUser> page1 = this.list(sysUserQueryWrapper);

        return page1;
    }
@@ -693,12 +697,10 @@

        // 添加
        if (StringUtils.isNull(dto.getUserId())) {

            boolean b = checkPhoneUnique(user);
            if (!b) {
                throw new ServiceException("该手机号已存在");
            }

            user.setNickName(dto.getNickName());
            user.setUserName(dto.getPhonenumber());
            user.setUserType("03");
@@ -727,10 +729,20 @@
            user.setUpdateTime(new Date());
            user.setUpdateBy(SecurityUtils.getUsername());
            user.setRoleType(dto.getRoleType());
            this.updateById(user);
            user.setProvinceCode(dto.getProvinceCode());
            user.setCityCode(dto.getCityCode());
            user.setCountyCode(dto.getCountyCode());
            user.setTownCode(dto.getTownCode());
            user.setProvinceName(dto.getProvinceName());
            user.setCityName(dto.getCityName());
            user.setCountyName(dto.getCountyName());
            user.setTownName(dto.getTownName());
            userMapper.updateHandle(user);
        }
    }



    @Override
    public void deleteConservator(Long id) {
        this.lambdaUpdate().set(SysUser::getDelFlag, "2").eq(SysUser::getUserId, id).update();