内部报验功能-取消

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionServiceImpl.java

@@ -418,7 +418,7 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
             return "单据号:".concat(operDto.getInspection().getInspectioncode()).concat("已取消不能重复取消,请刷新数据查看");
         }
 
-        //既不是站长也不是被派检验员，不能执行取消操作
+        //执行页面，既不是站长也不是被派检验员，不能执行取消操作
         boolean leaderFlag = false;
         //站长/主任/副主任
         List<SysRoleDo> roleDos = operDto.getOperUser().getRoleDos().stream()
@@ -427,7 +427,7 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         if(roleDos.size() > 0) {
             leaderFlag = true;
         }
-        if(!leaderFlag && !operDto.getOperUser().getId().equals(operDto.getDispatch().getSupervisionid())) {
+        if("execute".equals(dto.getPageType()) && !leaderFlag && !operDto.getOperUser().getId().equals(operDto.getDispatch().getSupervisionid())) {
             return "单据号:".concat(operDto.getInspection().getInspectioncode()).concat("已被改派或权限不够不能取消,请刷新数据查看");
         }