From 629ee07ae56fbedeec143fa722b982f0e62d5219 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 23 Jun 2021 14:52:29 +0800
Subject: [PATCH] screen-manage 修复型号增加因子空指针异常BUG
---
screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java
index b7fb204..3057cb7 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java
@@ -31,6 +31,7 @@
private long size;
+
private List<UnitConversionVO> unitConversions;
public static UnitConversionQueryVO convert(UnitConversionQueryDTO dto) {
@@ -63,7 +64,8 @@
vo.setId(unitConversion.getId());
vo.setOriginalUnitName(originalUnit.getDataValue());
vo.setTargetUnitName(targetUnit.getDataValue());
- vo.setFormula(formulaConvert(unitConversion.getFormula(),originalUnit.getDataValue(),targetUnit.getDataValue()));
+ vo.setFormula(unitConversion.getFormula());
+ vo.setSensorCode(unitConversion.getSensorCode());
return vo;
}
--
Gitblit v1.8.0