From cf08f9cb84e07601519e56c5554ca4cca6aa4372 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 24 七月 2024 08:59:11 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 3316304..a2dda56 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
@@ -558,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
@@ -586,15 +586,15 @@
@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, "01")
+ ), 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())) {
return PageDTO.empty(page);
}
- return PageDTO.of(page, SupplierVO.class);
+ return PageDTO.of(page,SupplierVO.class);
}
/**
@@ -606,17 +606,19 @@
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("01");
+ user.setUserType("02");
+ user.setContacts(dto.getContacts());
user.setCreateTime(new Date());
user.setCreateBy(SecurityUtils.getUsername());
- user.setContacts(dto.getContacts());
this.save(user);
} else {
// 编辑
@@ -626,9 +628,8 @@
}
user.setNickName(dto.getNickName());
user.setPhonenumber(dto.getPhonenumber());
- user.setUserName(dto.getPhonenumber());
- user.setUpdateTime(new Date());
user.setContacts(dto.getContacts());
+ user.setUpdateTime(new Date());
user.setUpdateBy(SecurityUtils.getUsername());
this.updateById(user);
}
@@ -650,8 +651,9 @@
Page<SysUser> page = this.lambdaQuery()
.select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber)
.like(StringUtils.isNotBlank(query.getNickName()
- ), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "02")
- .eq(SysUser::getPhonenumber,query.getPhonenumber()).eq(SysUser::getRoleType,query.getRoleType())
+ ), 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())) {
@@ -671,7 +673,7 @@
if (StringUtils.isNull(dto.getUserId())) {
user.setNickName(dto.getNickName());
user.setUserName(dto.getPhonenumber());
- user.setUserType("02");
+ user.setUserType("03");
user.setCreateTime(new Date());
user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
user.setCreateBy(SecurityUtils.getUsername());
--
Gitblit v1.7.1