From 66df2da5f7c05787ff215a66cfc882bc238bbcc4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 20:39:02 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 99 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 insertions(+), 33 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 5c50770..5098818 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
@@ -2,6 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.feignClient.AppUserShopClient;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.AppUserShop;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.SpringUtils;
@@ -14,6 +18,7 @@
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.model.UserShop;
import com.ruoyi.system.api.query.ChangeUserQuery;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
@@ -30,10 +35,7 @@
import javax.annotation.Resource;
import javax.validation.Validator;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -78,6 +80,15 @@
@Lazy
@Resource
private ISysDeptService deptService;
+
+ @Resource
+ private UserShopService userShopService;
+
+ @Resource
+ private AppUserShopClient appUserShopClient;
+
+ @Resource
+ private AppUserClient appUserClient;
/**
@@ -285,15 +296,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int updateUser(SysUser user) {
-// Long userId = user.getUserId();
-// // 删除用户与角色关联
-// userRoleMapper.deleteUserRoleByUserId(userId);
-// // 新增用户与角色管理
-// insertUserRole(user);
-// // 删除用户与岗位关联
-// userPostMapper.deleteUserPostByUserId(userId);
-// // 新增用户与岗位管理
-// insertUserPost(user);
return userMapper.updateUser(user);
}
@@ -439,17 +441,37 @@
* @return 结果
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public int deleteUserByIds(Long[] userIds) {
- for (Long userId : userIds) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = this.getById(userid);
+ for (Long userId : userIds) {
checkUserAllowed(new SysUser(userId));
-// checkUserDataScope(userId);
}
- // 删除用户与角色关联
-// userRoleMapper.deleteUserRole(userIds);
-// // 删除用户与岗位关联
-// userPostMapper.deleteUserPost(userIds);
- return userMapper.deleteUserByIds(userIds);
+ List<SysUser> sysUsers = this.listByIds(Arrays.asList(userIds));
+ for (SysUser user : sysUsers) {
+ if(2 == user.getRoleType()){
+ userShopService.remove(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId()).eq(UserShop::getShopId, sysUser.getObjectId()));
+ AppUser appUser = appUserClient.getAppUserByPhone1(user.getPhonenumber()).getData();
+ if(null != appUser){
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(sysUser.getObjectId());
+ appUserShopClient.delAppUserShop(appUserShop);
+ int size = appUserShopClient.getAppUserShop(appUser.getId()).getData().size();
+ if(size == 0){
+ appUser.setUserType(1);
+ appUserClient.editAppUserById(appUser);
+ }
+ }
+ long count = userShopService.count(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId()));
+ if(0 == count){
+ userMapper.deleteUserById(user.getUserId());
+ }
+ }else{
+ userMapper.deleteUserById(user.getUserId());
+ }
+ }
+ return 0;
}
/**
@@ -519,20 +541,31 @@
}
List<SysUser> list = this.baseMapper.getList(pageInfo, getSysUserList);
for (SysUser sysUser : list) {
- List<SysUserRole> list1 = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId()));
- List<String> roleNames = new ArrayList<>();
- for (SysUserRole sysUserRole : list1) {
- SysRole sysRole = sysRoleService.selectRoleById(sysUserRole.getRoleId());
- if(null == sysRole){
- continue;
+ if(sysUser.getRoleType() == 2){
+ UserShop userShop = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getShopId, sysUser1.getObjectId()).eq(UserShop::getUserId, sysUser.getUserId()));
+ SysRole sysRole = roleMapper.selectRoleById(userShop.getRoleId());
+ Long[] roleIds = new Long[]{userShop.getRoleId()};
+ sysUser.setNickName(userShop.getNickName());
+ sysUser.setRoleIds(roleIds);
+ sysUser.setRoleNames(Arrays.asList(sysRole.getRoleName()));
+ SysDept sysDept = deptService.selectDeptById(userShop.getDeptId());
+ sysUser.setDept(sysDept);
+ }else{
+ List<SysUserRole> list1 = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId()));
+ List<String> roleNames = new ArrayList<>();
+ for (SysUserRole sysUserRole : list1) {
+ SysRole sysRole = sysRoleService.selectRoleById(sysUserRole.getRoleId());
+ if(null == sysRole){
+ continue;
+ }
+ roleNames.add(sysRole.getRoleName());
}
- roleNames.add(sysRole.getRoleName());
+ Long[] roleIds = new Long[]{};
+ sysUser.setRoleIds(list1.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()).toArray(roleIds));
+ sysUser.setRoleNames(roleNames);
+ SysDept sysDept = deptService.selectDeptById(sysUser.getDeptId());
+ sysUser.setDept(sysDept);
}
- Long[] roleIds = new Long[]{};
- sysUser.setRoleIds(list1.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()).toArray(roleIds));
- sysUser.setRoleNames(roleNames);
- SysDept sysDept = deptService.selectDeptById(sysUser.getDeptId());
- sysUser.setDept(sysDept);
}
return pageInfo.setRecords(list);
}
--
Gitblit v1.7.1