From b253f9761274267b94dde103afaf34618626aeaa Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 13 Feb 2025 16:13:25 +0800
Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../production/service/impl/ReworkRecordServiceImpl.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java
index b8236bb..eb01bf6 100644
--- a/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java
@@ -109,7 +109,8 @@ public class ReworkRecordServiceImpl extends ServiceImpl<ReworkRecordMapper,Rewo
     public void removeRework(ReworkRecord reworkRecord) {
         SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
         List<SysRoleEntity> checkUserRole=dailyPlanMapper.checkUserRole(currentUser.getUserId(),"管理员");
-        if(checkUserRole.size()==0){
+        List<SysRoleEntity> checkUserRole2=dailyPlanMapper.checkUserRole(currentUser.getUserId(),"部门管理员");
+        if(checkUserRole.size()==0&&checkUserRole2.size()==0){
             throw new RuntimeException("该用户没有权限");
         }
         lambdaUpdate().eq(ReworkRecord::getReworkNo,reworkRecord.getReworkNo()).remove();
@@ -119,7 +120,8 @@ public class ReworkRecordServiceImpl extends ServiceImpl<ReworkRecordMapper,Rewo
     public void cancelRework(ReworkRecord reworkRecord) {
         SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
         List<SysRoleEntity> checkUserRole=dailyPlanMapper.checkUserRole(currentUser.getUserId(),"管理员");
-        if(checkUserRole.size()==0){
+        List<SysRoleEntity> checkUserRole2=dailyPlanMapper.checkUserRole(currentUser.getUserId(),"部门管理员");
+        if(checkUserRole.size()==0&&checkUserRole2.size()==0){
             throw new RuntimeException("该用户没有权限");
         }
         baseMapper.cancelRework(reworkRecord