From d09ad41d7c54a3be65e13846772a56c8a96154bb Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 25 Mar 2024 18:06:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2082879=20=E5=B7=A5=E4=BD=9C=E7=BB=84&?=
 =?UTF-8?q?=E8=B5=B7=E8=8D=89=E7=BB=84--=E9=9D=9E=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E8=A7=92=E8=89=B2--=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
 =?UTF-8?q?=E7=9C=8B=E5=88=B0=E4=BA=86=E9=9D=9E=E8=87=AA=E5=B7=B1=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayWorkingGroupController.java | 26 +++++++++++--------
 .../impl/PayWorkingGroupServiceImpl.java      | 20 ++++++++------
 2 files changed, 27 insertions(+), 19 deletions(-)

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<PayWorkingGroup, I
 			if(!CollectionUtils.isEmpty(listPayWorkingGroupVO)){
 				setPayWorkingGroupSubItem(listPayWorkingGroupVO);
 				listPayWorkingGroupVO.forEach(p->{
-					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<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()) &&
+		 		 !Objects.equals(payWorkingGroupOld.getPrincipalIdB(),sysUser.getId())) {
+			 return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "数据权限不足！");
+		 }
 		 payWorkingGroupService.copy(payWorkingGroup);
 		 return Result.OK("复制成功！");
 	 }
@@ -327,10 +329,12 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 			}
 		}
 
-//		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()) &&
+				!Objects.equals(payWorkingGroupOld.getPrincipalIdB(),sysUser.getId())) {
+			return Result.error(payWorkingGroupOld.getWorkingGroupProject() + "数据权限不足！");
+		}
 		try {
 			// 编辑保存前再次校验来款项目是否存在
 			LambdaQueryWrapper<PayWorkingGroup> 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<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()) &&
+                !Objects.equals(payWorkingGroupOld.getPrincipalIdB(),sysUser.getId())){
+            throw new JeroBootException(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！");
+        }
 
         LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();
         query.eq(PayWorkingGroupSubItem::getWorkingGroupId,id);
@@ -146,10 +148,12 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
             if(Objects.isNull(payWorkingGroupOld)){
                 throw new JeroBootException("工作组不存在！");
             }
-//            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//            if(!rolePermissionService.getRolePermission("workingGroupProject:batchDel") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){
-//                sb.append(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！<br/>");
-//            }
+            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() + "工作组项目不可操作！<br/>");
+            }
             LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();
             query.eq(PayWorkingGroupSubItem::getWorkingGroupId, p);
             List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query);