From d20a4aade6f9ed5111b496ac9abdff9f05f81535 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 一月 2025 22:32:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 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 9bde5e4..c1a051d 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;
@@ -79,6 +83,12 @@
@Resource
private UserShopService userShopService;
+
+ @Resource
+ private AppUserShopClient appUserShopClient;
+
+ @Resource
+ private AppUserClient appUserClient;
/**
@@ -126,6 +136,10 @@
@Override
public SysUser selectUserByUserName(String userName) {
return userMapper.selectUserByUserName(userName);
+ }
+ @Override
+ public SysUser selectUserShopByUserName(String userName) {
+ return userMapper.selectUserShopByUserName(userName);
}
/**
@@ -286,15 +300,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);
}
@@ -441,23 +446,36 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public int deleteUserByIds(Long[] userIds) {
- for (Long userId : userIds) {
+ public void deleteUserByIds(Long[] 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);
- int i = 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, user.getObjectId()));
- }
+ 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 i;
}
/**
--
Gitblit v1.7.1