代码提交 bug解决

无关风月

2024-08-01 8876b1b9cd27fad076ea9e5f3e04197b84ba02bd

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

@@ -1,14 +1,19 @@
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;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.SpringUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanValidators;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.common.security.utils.SecurityUtils;
@@ -586,7 +591,7 @@
    @Override
    public PageDTO<SupplierVO> getSupplierPage(SupplierQuery query) {
        Page<SysUser> page = this.lambdaQuery()
                .select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber)
                .select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber, SysUser::getContacts)
                .like(StringUtils.isNotBlank(query.getNickName()
                ), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "02")
                .eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime)
@@ -594,7 +599,18 @@
        if (StringUtils.isEmpty(page.getRecords())) {
            return PageDTO.empty(page);
        }
        return PageDTO.of(page, SupplierVO.class);
        return PageDTO.of(page,SupplierVO.class);
    }

    @Override
    public List<SysUser> getSupplierPage1() {
        LambdaQueryWrapper<SysUser> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(SysUser::getUserType, "02");


        wrapper1.eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime);
        List<SysUser> page1 = this.list(wrapper1);
        return page1;
    }

    /**
@@ -606,14 +622,17 @@
    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())) {
            boolean b = checkPhoneUnique(user);
            if (!b) {
                throw new ServiceException("该手机号已存在");
            }
            user.setUserName(dto.getPhonenumber());
            user.setUserType("02");
            user.setContacts(dto.getContacts());
            user.setCreateTime(new Date());
            user.setCreateBy(SecurityUtils.getUsername());
            this.save(user);
@@ -625,7 +644,7 @@
            }
            user.setNickName(dto.getNickName());
            user.setPhonenumber(dto.getPhonenumber());
            user.setUserName(dto.getPhonenumber());
            user.setContacts(dto.getContacts());
            user.setUpdateTime(new Date());
            user.setUpdateBy(SecurityUtils.getUsername());
            this.updateById(user);
@@ -645,38 +664,52 @@

    @Override
    public PageDTO<ConservatorVO> getConservatorPage(ConservatorQuery query) {
        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(StringUtils.isNotBlank(query.getPhonenumber()
                ),SysUser::getPhonenumber,query.getPhonenumber())
                .eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        if (StringUtils.isEmpty(page.getRecords())) {
            return PageDTO.empty(page);
        Page<SysUser> objectPage = new Page<>(query.getPageCurr(), query.getPageSize());

        LambdaQueryWrapper<SysUser> wrapper1= Wrappers.lambdaQuery();
        wrapper1.like(StringUtils.isNotBlank(query.getNickName()
        ),SysUser::getNickName,query.getNickName());
        wrapper1.eq(SysUser::getUserType, "03");
        if (query.getRoleType()!=0){
            wrapper1.eq(SysUser::getRoleType, query.getRoleType());
        }
        return PageDTO.of(page, ConservatorVO.class);

        wrapper1.like(StringUtils.isNotBlank(query.getPhonenumber()
        ),SysUser::getPhonenumber,query.getPhonenumber()) .eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime);
        Page<SysUser> page1 = this.page(objectPage, wrapper1);

        return PageDTO.of(page1, ConservatorVO.class);
    }

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

        return page1;
    }

    @Override
    public void saveConservator(ConservatorDTO dto) {
        SysUser user = BeanUtils.copyBean(dto, SysUser.class);
        boolean b = checkPhoneUnique(user);
        if (!b) {
            throw new ServiceException("该手机号已存在");
        }

        // 添加
        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");
            user.setCreateTime(new Date());
            user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            user.setPassword(SecurityUtils.encryptPassword("123456"));
            user.setCreateBy(SecurityUtils.getUsername());
            user.setProvinceName(dto.getProvinceName());
            user.setProvinceCode(dto.getProvinceCode());
            user.setCityName(dto.getCityCode());
            user.setCityName(dto.getCityName());
            user.setCityCode(dto.getCityCode());
            user.setCountyName(dto.getCountyName());
            user.setCountyCode(dto.getCountyCode());
@@ -694,13 +727,22 @@
            user.setPhonenumber(dto.getPhonenumber());
            user.setUserName(dto.getPhonenumber());
            user.setUpdateTime(new Date());
            user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            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();