From 3ec572e2cb7adf7d33d2018b24c003d9ef18906a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 12 十一月 2024 13:32:51 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/service/impl/SysUserServiceImpl.java | 64 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/service/impl/SysUserServiceImpl.java b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/service/impl/SysUserServiceImpl.java
index bf332d7..d818209 100644
--- a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/service/impl/SysUserServiceImpl.java
+++ b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/service/impl/SysUserServiceImpl.java
@@ -9,21 +9,22 @@
import com.xinquan.common.core.web.page.PageInfo;
import com.xinquan.common.datascope.annotation.DataScope;
import com.xinquan.common.security.utils.SecurityUtils;
+import com.xinquan.system.api.domain.SysDept;
import com.xinquan.system.api.domain.SysRole;
import com.xinquan.system.api.domain.SysUser;
+import com.xinquan.system.api.domain.vo.SysUserVO;
import com.xinquan.system.domain.SysPost;
+import com.xinquan.system.domain.SysUserDept;
import com.xinquan.system.domain.SysUserPost;
import com.xinquan.system.domain.SysUserRole;
-import com.xinquan.system.mapper.SysPostMapper;
-import com.xinquan.system.mapper.SysRoleMapper;
-import com.xinquan.system.mapper.SysUserMapper;
-import com.xinquan.system.mapper.SysUserPostMapper;
-import com.xinquan.system.mapper.SysUserRoleMapper;
+import com.xinquan.system.domain.dto.SysUserQuery;
+import com.xinquan.system.mapper.*;
import com.xinquan.system.service.ISysConfigService;
import com.xinquan.system.service.ISysUserService;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
+import javax.annotation.Resource;
import javax.validation.Validator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,6 +57,8 @@
@Autowired
private SysUserPostMapper userPostMapper;
+ @Autowired
+ private SysUserDeptMapper sysUserDeptMapper;
@Autowired
private ISysConfigService configService;
@@ -204,7 +207,7 @@
public boolean checkPhoneUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
- SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
+ SysUser info = userMapper.checkPhoneUnique(user.getUserName());
if (StringUtils.isNotNull(info) )
{
return UserConstants.NOT_UNIQUE;
@@ -276,10 +279,10 @@
{
// 新增用户信息
int rows = userMapper.insertUser(user);
-// // 新增用户岗位关联
-// insertUserPost(user);
-// // 新增用户与角色管理
-// insertUserRole(user);
+ // 新增用户岗位关联
+ insertUserDept(user);
+ // 新增用户与角色管理
+ insertUserRole(user);
return rows;
}
@@ -305,15 +308,15 @@
@Transactional(rollbackFor = Exception.class)
public int updateUser(SysUser user)
{
-// Long userId = user.getUserId();
+ Long userId = user.getUserId();
// // 删除用户与角色关联
-// userRoleMapper.deleteUserRoleByUserId(userId);
+ userRoleMapper.deleteUserRoleByUserId(userId);
// // 新增用户与角色管理
-// insertUserRole(user);
+ insertUserRole(user);
// // 删除用户与岗位关联
-// userPostMapper.deleteUserPostByUserId(userId);
+ userPostMapper.deleteUserDeptByUserId(userId);
// // 新增用户与岗位管理
-// insertUserPost(user);
+ insertUserDept(user);
return userMapper.updateUser(user);
}
@@ -331,6 +334,7 @@
insertUserRole(userId, roleIds);
}
+
/**
* 修改用户状态
*
@@ -341,6 +345,11 @@
public int updateUserStatus(SysUser user)
{
return userMapper.updateUser(user);
+ }
+ @Override
+ public int updateDeptStatus(SysDept user)
+ {
+ return userMapper.updateDept(user);
}
/**
@@ -377,7 +386,7 @@
@Override
public int resetPwd(SysUser user)
{
- return userMapper.updateUser(user);
+ return userMapper.updatePwd(user);
}
/**
@@ -408,21 +417,22 @@
*
* @param user 用户对象
*/
- public void insertUserPost(SysUser user)
+
+ public void insertUserDept(SysUser user)
{
- Long[] posts = user.getPostIds();
+ List<Long> posts = user.getDeptIds();
if (StringUtils.isNotEmpty(posts))
{
// 新增用户与岗位管理
- List<SysUserPost> list = new ArrayList<SysUserPost>();
+ List<SysUserDept> list = new ArrayList<SysUserDept>();
for (Long postId : posts)
{
- SysUserPost up = new SysUserPost();
+ SysUserDept up = new SysUserDept();
up.setUserId(user.getUserId());
- up.setPostId(postId);
+ up.setDeptId(postId);
list.add(up);
}
- userPostMapper.batchUserPost(list);
+ sysUserDeptMapper.batchUserDept(list);
}
}
@@ -561,7 +571,7 @@
}
@Override
- public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, String phonenumber) {
+ public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, SysUserVO phonenumber) {
return this.baseMapper.getList(pageInfo,phonenumber);
}
@@ -574,7 +584,13 @@
public List<Long> getSysUserFromPhone(String phoneNumber) {
return this.baseMapper.getSysUserFromPhone(phoneNumber);
}
-
+ @Override
+ public PageInfo<SysUserVO> pageList(SysUserQuery query) {
+ PageInfo<SysUserVO> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize());
+ List<SysUserVO> list = userMapper.pageList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
@Override
public void deleteSysUser(ArrayList<Integer> userIds) {
this.baseMapper.deleteSysUser(userIds);
--
Gitblit v1.7.1