From 86b1093e1082ac950408765e0f70c03c741d5f5a Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期一, 09 六月 2025 11:46:29 +0800 Subject: [PATCH] 装备导入检验项目优化 --- basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java index 6c3275e..94338da 100644 --- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java +++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java @@ -273,11 +273,15 @@ str.setRates(list1.get(26) + ""); } // 鎶芥牱绫诲瀷 - String spotCheckType = list1.get(27).toString(); - if (ObjectUtils.isNotEmpty(spotCheckType)) { - List<SysDictData> enums = dictTypeService.selectDictDataByName("鎶芥绫诲瀷") - .stream().filter(sysDictData -> sysDictData.getDictLabel().equals(spotCheckType)).collect(Collectors.toList()); - str.setSpotCheckType(enums.get(0).getDictValue()); + if (list1.get(27) != null){ + String spotCheckType = list1.get(27).toString(); + if (ObjectUtils.isNotEmpty(spotCheckType)) { + List<SysDictData> enums = dictTypeService.selectDictDataByName("鎶芥绫诲瀷") + .stream().filter(sysDictData -> sysDictData.getDictLabel().equals(spotCheckType)).collect(Collectors.toList()); + str.setSpotCheckType(enums.get(0).getDictValue()); + } + }else { + str.setSpotCheckType(null); } lists.add(str); } -- Gitblit v1.9.3