wangliang 1 год назад
Родитель
Сommit
0113b29e7f

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

@@ -1129,7 +1129,8 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
             Long deviceInOutTime = null;
             for (FlowFormWidgetResult f : flowFormWidgetResultList) {
                 if ((f.getFormId().contains(SystemConstant.DEVICE_OUT_TIME) || f.getFormId()
-                        .contains(SystemConstant.DEVICE_IN_TIME)) && Objects.nonNull(f.getValue())) {
+                        .contains(SystemConstant.DEVICE_IN_TIME)) && Objects.nonNull(f.getValue()) && !f.getValue()
+                        .contains("null")) {
                     JSONObject jsonObject = JSONObject.parseObject(f.getValue());
                     String value = jsonObject.getString(SystemConstant.VALUE);
                     deviceInOutTime = Long.parseLong(value);