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

feat: 工作組负责人A和B的权限统一，都可以进行编辑操作（在研项目、成员单位、工作组信息的维护）

Browse Source
This commit is contained in:
mzaxd
2024-03-13 11:06:51 +08:00
parent bd1a21d74e
commit a5425826df
2 changed files with 12 additions and 12 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
+8 -8
View File
@@ -253,10 +253,10 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
if(Objects.isNull(payWorkingGroupOld)){
return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "工作组不存在！");
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!rolePermissionService.getRolePermission("workingGroupProject:copy") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "数据权限不足！");
}
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// if(!rolePermissionService.getRolePermission("workingGroupProject:copy") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
// return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "数据权限不足！");
// }
payWorkingGroupService.copy(payWorkingGroup);
return Result.OK("复制成功！");
}
@@ -316,10 +316,10 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
if(Objects.isNull(payWorkingGroupOld)){
return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "工作组不存在！");
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!rolePermissionService.getRolePermission("workingGroupProject:edit") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "数据权限不足！");
}
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// if(!rolePermissionService.getRolePermission("workingGroupProject:edit") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
// return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "数据权限不足！");
// }
try {
// 编辑保存前再次校验来款项目是否存在
LambdaQueryWrapper<PayWorkingGroup> queryWrapper = new LambdaQueryWrapper<>();
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+4 -4
View File
@@ -110,10 +110,10 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
public void deleteById(String id) {
PayWorkingGroup payWorkingGroupOld = payWorkingGroupService.getById(id);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!rolePermissionService.getRolePermission("workingGroupProject:delete") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
throw new JeroBootException(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！");
}
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// if(!rolePermissionService.getRolePermission("workingGroupProject:delete") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
// throw new JeroBootException(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！");
// }
LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();
query.eq(PayWorkingGroupSubItem::getWorkingGroupId,id);