lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gitea/updateMenu' into updateMenu

Browse Source
This commit is contained in:
lcj
2025-12-22 12:26:38 +08:00
parent 44b9378b13 6d2bff6de3
commit db2785e4c5
1 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/SysRoleWorkServiceImpl.java
View File

@ -24,7 +24,10 @@ import org.dromara.system.service.impl.SysRoleServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/** /**
* 角色流程对应Service业务层处理 * 角色流程对应Service业务层处理
@ -242,33 +245,46 @@ public class SysRoleWorkServiceImpl extends ServiceImpl<SysRoleWorkMapper, SysRo
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
// 获取当前登录用户的所有项目及对应所有角色 // 获取当前登录用户的所有项目及对应所有角色
List<SysUserRole> allRoleList = baseMapper.getAllRoleList(userId); List<SysUserRole> allRoleList = baseMapper.getAllRoleList(userId);
// 获取项目
List<BusProjectVo> busProjectVoList = new ArrayList<>(); List<BusProjectVo> busProjectVoList = new ArrayList<>();
//维护一个该用户的 项目ID:角色ID map
Map<Long,Long> map = new HashMap<>();
//获取到该用户所有有流程的项目 说明在该项目下该用户有角色有所属流程 //获取到该用户所有有流程的项目 说明在该项目下该用户有角色有所属流程
for (SysUserRole sysUserRole : allRoleList) { for (SysUserRole sysUserRole : allRoleList) {
BusProjectQueryReq req = new BusProjectQueryReq(); // 检查该项目下该角色是否有流程配置
req.setId(sysUserRole.getProjectId()); LambdaQueryWrapper<SysRoleWork> lqw = new LambdaQueryWrapper<>();
List<BusProjectVo> vos = projectService.queryList(req); lqw.eq(SysRoleWork::getRoleId, sysUserRole.getRoleId());
if (vos != null && !vos.isEmpty()){ lqw.eq(SysRoleWork::getProjectId, sysUserRole.getProjectId());
if(!busProjectVoList.contains(vos.getFirst())){ List<SysRoleWork> list = list(lqw);
busProjectVoList.add(vos.getFirst());
map.put(sysUserRole.getProjectId(),sysUserRole.getRoleId()); // 只有当存在流程配置时才添加项目
if (list != null && !list.isEmpty()) {
//这个用户的项目 有流程的角色 才会进入这里
BusProjectQueryReq req = new BusProjectQueryReq();
req.setId(sysUserRole.getProjectId());
List<BusProjectVo> vos = projectService.queryList(req);
//把这个用户有角色并且有流程的项目添加到列表中
if (vos != null && !vos.isEmpty()){
if(!busProjectVoList.contains(vos.getFirst())){
busProjectVoList.add(vos.getFirst());
}
} }
} }
} }
//遍历反查
List<SysRoleWork> roleWorks = this.list();
List<SysRoleVo> roleVos; List<SysRoleVo> roleVos;
for (BusProjectVo projectVo : busProjectVoList) { for (BusProjectVo projectVo : busProjectVoList) {
roleVos = new ArrayList<>(); roleVos = new ArrayList<>();
for (SysRoleWork roleWork : roleWorks) { List<SysUserRole> roleList = baseMapper.getRoleList(userId, projectVo.getId());
if (map.containsKey(projectVo.getId()) && roleWork.getRoleId().equals(map.get(projectVo.getId()))){ for (SysUserRole userRole : roleList) {
SysRoleVo sysRoleVo = roleService.selectRoleById(roleWork.getRoleId()); LambdaQueryWrapper<SysRoleWork> lqw = new LambdaQueryWrapper<>();
if (sysRoleVo != null){ lqw.eq(SysRoleWork::getRoleId, userRole.getRoleId());
roleVos.add(sysRoleVo); lqw.eq(SysRoleWork::getProjectId,projectVo.getId());
List<SysRoleWork> list = list(lqw);
for (SysRoleWork roleWork : list) {
SysRoleVo roleVo = roleService.selectRoleById(roleWork.getRoleId());
if (roleVo != null){
roleVos.add(roleVo);
} }
} }
} }
@ -276,23 +292,6 @@ public class SysRoleWorkServiceImpl extends ServiceImpl<SysRoleWorkMapper, SysRo
} }
//遍历
// for (BusProjectVo projectVo : busProjectVoList) {
// roleVos = new ArrayList<>();
// //通过项目查找所有角色
// LambdaQueryWrapper<SysRoleWork> lqw1 = new LambdaQueryWrapper<>();
// lqw1.eq(SysRoleWork::getProjectId,projectVo.getId());
// List<SysRoleWork> roleWorkList = list(lqw1);
// //遍历
// for (SysRoleWork sysRoleWork : roleWorkList) {
// SysRoleVo sysRoleVo = roleService.selectRoleById(sysRoleWork.getRoleId());
// if (sysRoleVo != null){
// roleVos.add(sysRoleVo);
// }
// }
// projectVo.setRoleVos(roleVos);
// }
return busProjectVoList; return busProjectVoList;
} }