From 54a10927e161c0fffb837865549556a8c58fa5a3 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期六, 20 七月 2024 22:29:50 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 71 insertions(+), 8 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 22c9d1d..872b010 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
@@ -17,8 +17,11 @@
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.vo.ConservatorVO;
import com.ruoyi.system.domain.vo.SupplierVO;
import com.ruoyi.system.mapper.SysPostMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
@@ -555,8 +558,8 @@
@Override
public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, String nickName,
- String phonenumber, Integer status) {
- return this.baseMapper.getList(pageInfo, nickName, phonenumber, status);
+ String phonenumber, Integer status ,Long deptId) {
+ return this.baseMapper.getList(pageInfo, nickName, phonenumber, status,deptId);
}
@Override
@@ -585,7 +588,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, "04")
+ ), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "02")
.eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
@@ -610,8 +613,7 @@
// 添加
if (StringUtils.isNull(dto.getUserId())) {
user.setUserName(dto.getPhonenumber());
- user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
- user.setUserType("04");
+ user.setUserType("02");
user.setCreateTime(new Date());
user.setCreateBy(SecurityUtils.getUsername());
this.save(user);
@@ -626,9 +628,6 @@
user.setUserName(dto.getPhonenumber());
user.setUpdateTime(new Date());
user.setUpdateBy(SecurityUtils.getUsername());
- if (StringUtils.isNotBlank(dto.getPassword())) {
- user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
- }
this.updateById(user);
}
}
@@ -642,4 +641,68 @@
public void deleteSupplier(Long id) {
this.lambdaUpdate().set(SysUser::getDelFlag, "2").eq(SysUser::getUserId, id).update();
}
+
+
+ @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);
+ }
+ return PageDTO.of(page, ConservatorVO.class);
+ }
+
+ @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())) {
+ user.setNickName(dto.getNickName());
+ user.setUserName(dto.getPhonenumber());
+ user.setUserType("03");
+ user.setCreateTime(new Date());
+ user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ user.setCreateBy(SecurityUtils.getUsername());
+ user.setProvinceName(dto.getProvinceName());
+ user.setProvinceCode(dto.getProvinceCode());
+ user.setCityName(dto.getCityCode());
+ user.setCityCode(dto.getCityCode());
+ user.setCountyName(dto.getCountyName());
+ user.setCountyCode(dto.getCountyCode());
+ user.setTownName(dto.getTownName());
+ user.setTownCode(dto.getTownCode());
+ user.setRoleType(dto.getRoleType());
+ this.save(user);
+ } 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());
+ user.setUpdateTime(new Date());
+ user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ user.setUpdateBy(SecurityUtils.getUsername());
+ user.setRoleType(dto.getRoleType());
+ this.updateById(user);
+ }
+ }
+
+ @Override
+ public void deleteConservator(Long id) {
+ this.lambdaUpdate().set(SysUser::getDelFlag, "2").eq(SysUser::getUserId, id).update();
+ }
}
--
Gitblit v1.7.1