更新判断逻辑

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

@@ -140,20 +140,22 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
         String inspectionStatus = inspectionItpDo.getInspectionstatus();
         String dispatchId = vo.getDispatchId();
         ZhcxOutsideInspectionItpSupervisionDispatchDo dispatchDo = new ZhcxOutsideInspectionItpSupervisionDispatchDo();
-
+        if (dispatchId != null) {
+            dispatchDo = dispatchService.getById(dispatchId);
+        } else {
+            dispatchDo.setId(SecurityUtil.getUUID());
+        }
         SysUserVo user = zhcxCommon.getCurrentUser();
         log.info("当前登录用户ID"+user.getId());
         boolean hasDispatch = false;
-        if (dispatchId == null) {
+        if (dispatchId == null || (dispatchDo != null && dispatchDo.getSupervisionid() == null)) {
             log.info("没有Dispatch");
-            dispatchDo.setId(SecurityUtil.getUUID());
             dispatchDo.setCreateuserid(user.getId());
             dispatchDo.setCreatedate(new Date());
             dispatchDo.setCreateusername(user.getName());
             dispatchDo.setItpid(vo.getItpId());
         } else {
             log.info("有Dispatch,有dispatchId="+dispatchId);
-            dispatchDo = dispatchService.getById(dispatchId);
             hasDispatch = true;
         }