From b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 08:59:57 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 71d303e..5d9aac9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/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;
@@ -21,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;
@@ -679,10 +677,32 @@
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");
+ 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() {
- List<SysUser> page1 = this.list();
+ 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;
}
@@ -690,20 +710,17 @@
@Override
public void saveConservator(ConservatorDTO dto) {
SysUser user = BeanUtils.copyBean(dto, SysUser.class);
-
// 添加
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("123456"));
+ user.setPassword(SecurityUtils.encryptPassword("a123456"));
user.setCreateBy(SecurityUtils.getUsername());
user.setProvinceName(dto.getProvinceName());
user.setProvinceCode(dto.getProvinceCode());
@@ -721,16 +738,30 @@
if (StringUtils.isNull(user)) {
throw new ServiceException("管理员不存在");
}
+ boolean b = checkPhoneUnique(user);
+ if (!b) {
+ throw new ServiceException("该手机号已存在");
+ }
user.setNickName(dto.getNickName());
user.setPhonenumber(dto.getPhonenumber());
user.setUserName(dto.getPhonenumber());
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();
--
Gitblit v1.7.1