bug fix

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -1254,7 +1254,8 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
         flowResult.setSetupMap(setupMap);
         tfCustomFlowEntity.updateInfo(sysUser.getId());
         tfCustomFlowEntity.setFlowProcessVar(JacksonUtil.parseJson(flowResult));
-        if (tfFlowApprove.getStatus() != FlowStatusEnum.FINISH && tfFlowApprove.getStatus() != FlowStatusEnum.END) {
+//        if (tfFlowApprove.getStatus() != FlowStatusEnum.FINISH && tfFlowApprove.getStatus() != FlowStatusEnum.END) {
+        if (tfFlowApprove.getStatus() != FlowStatusEnum.END) {
             Map<String, Object> map = new HashMap<>();
             CrmProjectResult crmProjectResult = tbCrmService.findCrmProjectBySopNoOrCrmNo(tfCustomFlowEntity.getCode(),
                     tfCustomFlowEntity.getCrmNo());
@@ -1275,12 +1276,12 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
             tbSopInfoService.saveJobRemind(map);
 
             if (tfCustomFlow.getType() == TFCustomTypeEnum.OFFICE_SOP_FLOW
-                    && tfFlowApprove.getSetup().intValue() >= 4) {
+                    && (tfFlowApprove.getSetup().intValue() >= 4 || tfFlowApprove.getSetup().intValue() == 0)) {
                 tbSopInfoService.sopDeviceInOutSave(map, 4);
             } else if (tfCustomFlow.getType() == TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW
-                    && tfFlowApprove.getSetup().intValue() >= 4) {
+                    && (tfFlowApprove.getSetup().intValue() >= 4 || tfFlowApprove.getSetup().intValue() == 0)) {
                 tbSopInfoService.sopDeviceInOutSave(map, 4);
-                if (tfFlowApprove.getSetup().intValue() > 5) {
+                if (tfFlowApprove.getSetup().intValue() > 5 || tfFlowApprove.getSetup().intValue() == 0) {
                     FlowTaskResult flowTaskResultDeviceOut = this.getFormProperties(tfCustomFlowEntity, 4);
                     tbDeviceDeliveryService.updateStatusBySop(flowTaskResultDeviceOut, DeviceDeliveryStatusEnum.RECEIVE,
                             sysUser.getId());