diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index a3638929..9c3c722a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -94,9 +94,9 @@ public class PayWorkingGroupController extends JeroController{ - if(!rolePermissionService.getRolePermission("generalProject:search") && Objects.equals(p.getPrincipalIdB(),sysUser.getId())){ - p.setCheckoutOperation(PayProjectCommon.CHECKOUT_OPERATION2); - }else{ + if(!rolePermissionService.getRolePermission("generalProject:search") && ( + Objects.equals(p.getPrincipalIdA(),sysUser.getId()) || + Objects.equals(p.getPrincipalIdB(),sysUser.getId()))){ p.setCheckoutOperation(PayProjectCommon.CHECKOUT_OPERATION1); } }); @@ -253,10 +253,12 @@ public class PayWorkingGroupController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index f3d49176..df31950e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -110,10 +110,12 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(PayWorkingGroupSubItem::getWorkingGroupId,id); @@ -146,10 +148,12 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl"); -// } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!rolePermissionService.getRolePermission("workingGroupProject:batchDel") && + !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId()) && + !Objects.equals(payWorkingGroupOld.getPrincipalIdB(),sysUser.getId())){ + sb.append(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作!
"); + } LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(PayWorkingGroupSubItem::getWorkingGroupId, p); List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query);