内部报验派单逻辑更改

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

@@ -693,12 +693,12 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
             InsideOperDto inOper = getInsideOperDto(insideId);
             inOper.setOperTime(operDto.getOperTime());
             inOper.setOperUser(operDto.getOperUser());
-            if (ObjectUtil.isEmpty(inOper.getDispatch().getSupervisionid())) {
-                log.info("单据号:".concat(inOper.getInspection().getInspectioncode()).concat("未派单,现将主表检验员覆盖到派单表上"));
-                inOper.getDispatch().setSupervisionid(inOper.getInspection().getCheckerid());
-                inOper.getDispatch().setSupervision(inOper.getInspection().getCheckername());
-                inOper.getDispatch().setSupervisionphone(inOper.getInspection().getCheckercontact());
-            }
+//            if (ObjectUtil.isEmpty(inOper.getDispatch().getSupervisionid())) {
+//                log.info("单据号:".concat(inOper.getInspection().getInspectioncode()).concat("未派单,现将主表检验员覆盖到派单表上"));
+//                inOper.getDispatch().setSupervisionid(inOper.getInspection().getCheckerid());
+//                inOper.getDispatch().setSupervision(inOper.getInspection().getCheckername());
+//                inOper.getDispatch().setSupervisionphone(inOper.getInspection().getCheckercontact());
+//            }
             //校验
             String msg = checkParam4Execute(inOper, req);
 
@@ -1340,9 +1340,12 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         }
 
         //如果角色中存在站长或者主任
-        boolean match = inOper.getOperUser().getRoleDos().stream().anyMatch(item -> "role095".equals(item.getCode()) || "role080".equals(item.getCode()));
+//        boolean match = inOper.getOperUser().getRoleDos().stream().anyMatch(item -> "role095".equals(item.getCode()) || "role080".equals(item.getCode()));
         //非站长等角色且不是被分派的人，无执行权限
-        if(!match && !inOper.getOperUser().getId().equals(inOper.getDispatch().getSupervisionid())) {
+//        if(!match && !inOper.getOperUser().getId().equals(inOper.getDispatch().getSupervisionid())) {
+//            return "单据号:".concat(inOper.getInspection().getInspectioncode()).concat("已被改派,不能操作,请刷新数据查看");
+//        }
+        if(!inOper.getOperUser().getId().equals(inOper.getDispatch().getSupervisionid())) {
             return "单据号:".concat(inOper.getInspection().getInspectioncode()).concat("已被改派,不能操作,请刷新数据查看");
         }