0412更新

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