From a5425826df27d88856dd438ac58a62c274206aff Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 13 Mar 2024 11:06:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E4=BD=9C=E7=B5=84=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E4=BA=BAA=E5=92=8CB=E7=9A=84=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=EF=BC=8C=E9=83=BD=E5=8F=AF=E4=BB=A5=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E7=BC=96=E8=BE=91=E6=93=8D=E4=BD=9C=EF=BC=88=E5=9C=A8?=
 =?UTF-8?q?=E7=A0=94=E9=A1=B9=E7=9B=AE=E3=80=81=E6=88=90=E5=91=98=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E3=80=81=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E7=BB=B4=E6=8A=A4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayWorkingGroupController.java    | 16 ++++++++--------
 .../service/impl/PayWorkingGroupServiceImpl.java |  8 ++++----
 2 files changed, 12 insertions(+), 12 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 49f32bf5..f40e449c 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
@@ -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<>();
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 4c4b4e35..78e58a27 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,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);