From 3e3b289a1dbedd82bcb737db750d69d268ef412e Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 27 十月 2022 13:35:52 +0800
Subject: [PATCH] 解决部门bug
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
index b9f8f3a..d0c2e46 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsDepartManageServiceImpl.java
@@ -15,6 +15,7 @@
import com.ycl.service.user.UmsDepartManageService;
import com.ycl.vo.depart.DepartVO;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -113,40 +114,40 @@
}
}
//缁戝畾鑿滃崟浜庣敤鎴�
- ArrayList<UmsRoleMenuRelation> umsRoleMenuRelations = new ArrayList<>();
- for (Long role : roles) {
- umsRoleMenuRelations.addAll(roleMenuRelationMapper
- .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
- .eq(UmsRoleMenuRelation::getRoleId, role)));
- }
- umsRoleMenuRelations
- .stream()
- .map(item->item.getMenuId())
- .collect(Collectors.toList())
- .stream()
- .distinct()
- .collect(Collectors.toList())
- .stream()
- .forEach(item -> {
- AdminMenuRelation adminMenuRelation = new AdminMenuRelation();
- adminMenuRelation.setAdminId(id);
- adminMenuRelation.setMenuId(item);
- adminMenuRelationMapper.insert(adminMenuRelation);
- });
+ ArrayList<UmsRoleMenuRelation> umsRoleMenuRelations = new ArrayList<>();
+ for (Long role : roles) {
+ umsRoleMenuRelations.addAll(roleMenuRelationMapper
+ .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
+ .eq(UmsRoleMenuRelation::getRoleId, role)));
+ }
+ umsRoleMenuRelations
+ .stream()
+ .map(item -> item.getMenuId())
+ .collect(Collectors.toList())
+ .stream()
+ .distinct()
+ .collect(Collectors.toList())
+ .stream()
+ .forEach(item -> {
+ AdminMenuRelation adminMenuRelation = new AdminMenuRelation();
+ adminMenuRelation.setAdminId(id);
+ adminMenuRelation.setMenuId(item);
+ adminMenuRelationMapper.insert(adminMenuRelation);
+ });
}
@Override
- public void userUpdateDepart(Long id, List<UmsDepartManage> departIds) {
- umsDepartManageMapper.delete(new LambdaQueryWrapper<UmsDepartManage>().eq(UmsDepartManage::getUserId,id));
- departIds
- .stream()
- .forEach(item->{
- UmsDepartManage umsDepartManage = new UmsDepartManage();
- umsDepartManage.setDepartId(item.getDepartId());
- umsDepartManage.setUserId(id);
- umsDepartManage.setIsLeader(item.getIsLeader());
- umsDepartManage.setCreateTime(new Date());
- umsDepartManageMapper.insert(umsDepartManage);
- });
+ @Transactional(rollbackFor = Exception.class)
+ public void userUpdateDepart(Long userId,Long departId) {
+ umsDepartManageMapper.delete(new LambdaQueryWrapper<UmsDepartManage>().eq(UmsDepartManage::getUserId,userId));
+ UmsDepartManage umsDepartManage = new UmsDepartManage();
+ umsDepartManage.setUserId(userId);
+ umsDepartManage.setCreateTime(new Date());
+ umsDepartManage.setDepartId(departId);
+ umsDepartManageMapper.insert(umsDepartManage);
+ UmsAdmin umsAdmin = new UmsAdmin();
+ umsAdmin.setDepartmentId(departId);
+ umsAdmin.setId(userId);
+ umsAdminService.updateById(umsAdmin);
}
}
\ No newline at end of file
--
Gitblit v1.8.0