LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 82879 工作组&起草组--非管理员角色--负责人看到了非自己负责的数据

Browse Source
This commit is contained in:
mzaxd
2024-03-25 18:07:07 +08:00
parent d5619036cf
commit d09ad41d7c
2 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+15 -11
View File
@@ -94,9 +94,9 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
if(!CollectionUtils.isEmpty(listPayWorkingGroupVO)){ if(!CollectionUtils.isEmpty(listPayWorkingGroupVO)){
setPayWorkingGroupSubItem(listPayWorkingGroupVO); setPayWorkingGroupSubItem(listPayWorkingGroupVO);
listPayWorkingGroupVO.forEach(p->{ listPayWorkingGroupVO.forEach(p->{
if(!rolePermissionService.getRolePermission("generalProject:search") && Objects.equals(p.getPrincipalIdB(),sysUser.getId())){ if(!rolePermissionService.getRolePermission("generalProject:search") && (
p.setCheckoutOperation(PayProjectCommon.CHECKOUT_OPERATION2); Objects.equals(p.getPrincipalIdA(),sysUser.getId()) ||
}else{ Objects.equals(p.getPrincipalIdB(),sysUser.getId()))){
p.setCheckoutOperation(PayProjectCommon.CHECKOUT_OPERATION1); p.setCheckoutOperation(PayProjectCommon.CHECKOUT_OPERATION1);
} }
}); });
@@ -253,10 +253,12 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
if(Objects.isNull(payWorkingGroupOld)){ if(Objects.isNull(payWorkingGroupOld)){
return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "工作组不存在！"); return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "工作组不存在！");
} }
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// if(!rolePermissionService.getRolePermission("workingGroupProject:copy") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){ if(!rolePermissionService.getRolePermission("workingGroupProject:copy") &&
// return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "数据权限不足！"); !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId()) &&
// } !Objects.equals(payWorkingGroupOld.getPrincipalIdB(),sysUser.getId())) {
return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "数据权限不足！");
}
payWorkingGroupService.copy(payWorkingGroup); payWorkingGroupService.copy(payWorkingGroup);
return Result.OK("复制成功！"); return Result.OK("复制成功！");
} }
@@ -327,10 +329,12 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
} }
} }
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// if(!rolePermissionService.getRolePermission("workingGroupProject:edit") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){ if(!rolePermissionService.getRolePermission("workingGroupProject:edit") &&
// return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "数据权限不足！"); !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId()) &&
// } !Objects.equals(payWorkingGroupOld.getPrincipalIdB(),sysUser.getId())) {
return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "数据权限不足！");
}
try { try {
// 编辑保存前再次校验来款项目是否存在 // 编辑保存前再次校验来款项目是否存在
LambdaQueryWrapper<PayWorkingGroup> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayWorkingGroup> queryWrapper = new LambdaQueryWrapper<>();
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+12 -8
View File
@@ -110,10 +110,12 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
public void deleteById(String id) { public void deleteById(String id) {
PayWorkingGroup payWorkingGroupOld = payWorkingGroupService.getById(id); PayWorkingGroup payWorkingGroupOld = payWorkingGroupService.getById(id);
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// if(!rolePermissionService.getRolePermission("workingGroupProject:delete") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){ if(!rolePermissionService.getRolePermission("workingGroupProject:delete") &&
// throw new JeroBootException(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！"); !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId()) &&
// } !Objects.equals(payWorkingGroupOld.getPrincipalIdB(),sysUser.getId())){
throw new JeroBootException(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！");
}
LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();
query.eq(PayWorkingGroupSubItem::getWorkingGroupId,id); query.eq(PayWorkingGroupSubItem::getWorkingGroupId,id);
@@ -146,10 +148,12 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
if(Objects.isNull(payWorkingGroupOld)){ if(Objects.isNull(payWorkingGroupOld)){
throw new JeroBootException("工作组不存在！"); throw new JeroBootException("工作组不存在！");
} }
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// if(!rolePermissionService.getRolePermission("workingGroupProject:batchDel") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){ if(!rolePermissionService.getRolePermission("workingGroupProject:batchDel") &&
// sb.append(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！<br/>"); !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId()) &&
// } !Objects.equals(payWorkingGroupOld.getPrincipalIdB(),sysUser.getId())){
sb.append(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！<br/>");
}
LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();
query.eq(PayWorkingGroupSubItem::getWorkingGroupId, p); query.eq(PayWorkingGroupSubItem::getWorkingGroupId, p);
List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query); List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query);