diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index 26c4ff291..cf1a655bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -292,6 +292,8 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, otaBaCxJsfzbacsOld, basc, sysDictService); saveOrUpdate(basc); @@ -314,7 +316,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl { if ("0".equals(ote.getType())) { if (str.length() > ote.getLen()) { errMsg.append(title + " 的长度超过了 " + ote.getLen() + ", "); - field.set(clazz, ""); + field.set(clazz, null); } } else if ("1".equals(ote.getType())) { if (!"1".equals(str) && !"2".equals(str)) { errMsg.append(title + " 必须填写有或无, "); - field.set(clazz, ""); + field.set(clazz, null); } } else if ("2".equals(ote.getType())) { if (!"1".equals(str) && !"2".equals(str)) { errMsg.append(title + " 必须填写是或否, "); - field.set(clazz, ""); + field.set(clazz, null); } } else if ("3".equals(ote.getType())) { //不处理 @@ -221,7 +221,7 @@ public class ComparisonUtil { String res = sysDictService.queryDictTextByKeyEn(ote.getType(), s, cut); if (StringUtils.isEmpty(res)) { errMsg.append(title + " 填写了无法识别的选项, "); - field.set(clazz, ""); + field.set(clazz, null); } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java index adb05d7f3..1259d0fec 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java @@ -166,7 +166,7 @@ public class ImportFileUtil { public static String getCellValueHaveOrNot(Cell cell, Workbook workbook) throws Exception { - String res = ""; + String res = "3"; String str = getCellValue(cell, workbook); if (StringUtils.isNotEmpty(str)) { if (str.equals("有")) { @@ -179,7 +179,7 @@ public class ImportFileUtil { } public static String getCellValueHaveOrNotInt(Integer val) throws Exception { - String res = ""; + String res = "3"; if (ObjectUtils.isNotEmpty(val)) { if (val.equals(1)) { res = "有"; @@ -191,7 +191,7 @@ public class ImportFileUtil { } public static String getCellValueYesOrNo(Cell cell, Workbook workbook) throws Exception { - String res = ""; + String res = "3"; String str = getCellValue(cell, workbook); if (StringUtils.isNotEmpty(str)) { if (str.equals("是")) { @@ -204,7 +204,7 @@ public class ImportFileUtil { } public static String getCellValueYesOrNoInt(Integer val) throws Exception { - String res = ""; + String res = "3"; if (ObjectUtils.isNotEmpty(val)) { if (val.equals(1)) { res = "是"; @@ -216,7 +216,7 @@ public class ImportFileUtil { } public static String getCellValueHaveOrNot(String str) throws Exception { - String res = ""; + String res = "3"; if (StringUtils.isNotEmpty(str)) { if (str.equals("1")) { res = "有"; @@ -228,7 +228,7 @@ public class ImportFileUtil { } public static String getCellValueYesOrNo(String str) throws Exception { - String res = ""; + String res = "3"; if (StringUtils.isNotEmpty(str)) { if (str.equals("1")) { res = "是";