监理相关操作逻辑调整

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

@@ -209,7 +209,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
             /* 取消 */
             if ("10".equals(operType)) {
                 //监理检验员只能操作自己的数据
-                if(hasJjyRole && !hasZgRole && !dispatchDo.getSupervisionuserid().equals(user.getId())){
+                if(!dispatchDo.getSupervisionuserid().equals(user.getId())){
                     sb.append("单据号:"+inspectioncode+"已被改派,不能取消,请刷新数据查看<br>");
                     continue;
                 }
@@ -228,7 +228,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
                 dispatchDo.setDispatchstatus("30");
                 inspectionItpDo.setInspectionstatus("40");
             } else if ("20".equals(operType)) {
-                if(hasJjyRole && !hasZgRole && !dispatchDo.getSupervisionuserid().equals(user.getId())){
+                if(!dispatchDo.getSupervisionuserid().equals(user.getId())){
                     sb.append("单据号:"+inspectioncode+"已被改派,不能拒收,请刷新数据查看<br>");
                     continue;
                 }
@@ -239,7 +239,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
                 inspectionItpDo.setInspectionstatus("30");
             } else if (Arrays.asList("30", "40").contains(operType)) {
                 //监理检验员只能操作自己的数据
-                if(hasJjyRole && !hasZgRole && !dispatchDo.getSupervisionuserid().equals(user.getId())){
+                if(!dispatchDo.getSupervisionuserid().equals(user.getId())){
                     sb.append("单据号:"+inspectioncode+"已被改派,不能取消,请刷新数据查看<br>");
                     continue;
                 }