From 4c8992891ac92ace938ad81f38d7b9fb6e5cd78c Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期六, 20 七月 2024 21:52:13 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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..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
@@ -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
@@ -588,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, "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())) {
@@ -613,10 +613,9 @@
// 添加
if (StringUtils.isNull(dto.getUserId())) {
user.setUserName(dto.getPhonenumber());
- user.setUserType("01");
+ user.setUserType("02");
user.setCreateTime(new Date());
user.setCreateBy(SecurityUtils.getUsername());
- user.setContacts(dto.getContacts());
this.save(user);
} else {
// 编辑
@@ -628,7 +627,6 @@
user.setPhonenumber(dto.getPhonenumber());
user.setUserName(dto.getPhonenumber());
user.setUpdateTime(new Date());
- user.setContacts(dto.getContacts());
user.setUpdateBy(SecurityUtils.getUsername());
this.updateById(user);
}
@@ -650,8 +648,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 +670,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