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

12-20-修复

Browse Source
This commit is contained in:
青云
2025-12-20 17:48:44 +08:00
parent b30aadfed9
commit 0110999480
2 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,56 +244,52 @@ public class SysRoleWorkServiceImpl extends ServiceImpl<SysRoleWorkMapper, SysRo
// 获取当前登录用户的所有项目及对应所有角色 // 获取当前登录用户的所有项目及对应所有角色
List<SysUserRole> allRoleList = baseMapper.getAllRoleList(userId); List<SysUserRole> allRoleList = baseMapper.getAllRoleList(userId);
//初始化
// LambdaQueryWrapper<SysRoleWork> lqw = new LambdaQueryWrapper<>();
List<BusProjectVo> busProjectVoList = new ArrayList<>(); List<BusProjectVo> busProjectVoList = new ArrayList<>();
//获取到该用户所有有流程的项目 说明在该项目下该用户有角色有所属流程 //获取到该用户所有有流程的项目 说明在该项目下该用户有角色有所属流程
for (SysUserRole sysUserRole : allRoleList) { for (SysUserRole sysUserRole : allRoleList) {
// lqw.clear(); // 检查该项目下该角色是否有流程配置
// lqw.eq(SysRoleWork::getProjectId,sysUserRole.getProjectId()); LambdaQueryWrapper<SysRoleWork> lqw = new LambdaQueryWrapper<>();
// lqw.eq(SysRoleWork::getRoleId, sysUserRole.getRoleId()); lqw.eq(SysRoleWork::getRoleId, sysUserRole.getRoleId());
// SysRoleWork one = getOne(lqw); lqw.eq(SysRoleWork::getProjectId, sysUserRole.getProjectId());
// if (one != null){ List<SysRoleWork> list = list(lqw);
// //先拿到该项目
// BusProjectQueryReq req = new BusProjectQueryReq(); // 只有当存在流程配置时才添加项目
// req.setId(sysUserRole.getProjectId()); if (list != null && !list.isEmpty()) {
// List<BusProjectVo> vos = projectService.queryList(req); //这个用户的项目 有流程的角色 才会进入这里
// if (vos != null && !vos.isEmpty()){ BusProjectQueryReq req = new BusProjectQueryReq();
// if(!busProjectVoList.contains(vos.getFirst())){ req.setId(sysUserRole.getProjectId());
// busProjectVoList.add(vos.getFirst()); List<BusProjectVo> vos = projectService.queryList(req);
// } //把这个用户有角色并且有流程的项目添加到列表中
// } if (vos != null && !vos.isEmpty()){
// } if(!busProjectVoList.contains(vos.getFirst())){
BusProjectQueryReq req = new BusProjectQueryReq(); busProjectVoList.add(vos.getFirst());
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<SysRoleVo> roleVos; List<SysRoleVo> roleVos;
for (BusProjectVo projectVo : busProjectVoList) { for (BusProjectVo projectVo : busProjectVoList) {
roleVos = new ArrayList<>(); roleVos = new ArrayList<>();
//通过项目查找所有角色 List<SysUserRole> roleList = baseMapper.getRoleList(userId, projectVo.getId());
LambdaQueryWrapper<SysRoleWork> lqw1 = new LambdaQueryWrapper<>(); for (SysUserRole userRole : roleList) {
lqw1.eq(SysRoleWork::getProjectId,projectVo.getId()); LambdaQueryWrapper<SysRoleWork> lqw = new LambdaQueryWrapper<>();
//获取角色 lqw.eq(SysRoleWork::getRoleId, userRole.getRoleId());
List<SysRoleWork> roleWorkList = list(lqw1); lqw.eq(SysRoleWork::getProjectId,projectVo.getId());
for (SysRoleWork sysRoleWork : roleWorkList) { List<SysRoleWork> list = list(lqw);
SysRoleVo sysRoleVo = roleService.selectRoleById(sysRoleWork.getRoleId()); for (SysRoleWork roleWork : list) {
if (sysRoleVo != null){ SysRoleVo roleVo = roleService.selectRoleById(roleWork.getRoleId());
roleVos.add(sysRoleVo); if (roleVo != null){
roleVos.add(roleVo);
}
} }
} }
projectVo.setRoleVos(roleVos); projectVo.setRoleVos(roleVos);
} }
return busProjectVoList; return busProjectVoList;
} }

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/controller/PdMasterController.java
View File

@ -46,7 +46,7 @@ public class PdMasterController extends BaseController {
/** /**
* 获取当前用户对应部门下的所有用户 * 获取当前用户对应部门下的所有用户
*/ */
@SaCheckPermission("patch:master:findThis") // @SaCheckPermission("patch:master:findThis")
@GetMapping("/findThis") @GetMapping("/findThis")
public R<List<SysUser>> findThis() { public R<List<SysUser>> findThis() {
return R.ok(userService.findThis()); return R.ok(userService.findThis());