修复气瓶充装后复查没有数据时追溯页面接口报错

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/TzCylinderServiceImpl.java

@@ -9,16 +9,22 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFileUrlDto;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.PageParam;
-import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.*;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderAfterCheckDto;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderBeforeCheckDto;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderCheckDto;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderFillingDto;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderInfoDto;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderInspectionDto;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderProduceDto;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderTagsDto;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderTraceDto;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderInfo;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.enums.CyclinderStatus;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.TzCylinderMapper;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.service.ITzCylinderService;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.validation.ValidationUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -148,17 +154,19 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 			List<TzCylinderCheckDto> tzCylinderAfterCheckDtoListResult = new ArrayList<>();
 			TzCylinderAfterCheckDto tzcylinderAfterCheckDto = tzCylinderMapper
 					.getTzCylinderAfterCheck(tzCylinderFillingDto.getFillingCheckId());
-			JSONObject obj = JSONObject.parseObject(JSONObject.toJSONString(tzcylinderAfterCheckDto));
-			for (String str : obj.keySet()) {
-				String explain = afterMap.get(str);
-				String value = String.valueOf(obj.get(str));
-				DataDictionary data = iDataDictionaryService
-						.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getSequenceNbr, value));
-				TzCylinderCheckDto tzcylinderCheckDto = new TzCylinderCheckDto(str, explain,
-						data != null ? data.getCode() : null);
-				tzCylinderAfterCheckDtoListResult.add(tzcylinderCheckDto);
+			if (!ValidationUtil.isEmpty(tzcylinderAfterCheckDto)) {
+				JSONObject obj = JSONObject.parseObject(JSONObject.toJSONString(tzcylinderAfterCheckDto));
+				for (String str : obj.keySet()) {
+					String explain = afterMap.get(str);
+					String value = String.valueOf(obj.get(str));
+					DataDictionary data = iDataDictionaryService
+							.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getSequenceNbr, value));
+					TzCylinderCheckDto tzcylinderCheckDto = new TzCylinderCheckDto(str, explain,
+							data != null ? data.getCode() : null);
+					tzCylinderAfterCheckDtoListResult.add(tzcylinderCheckDto);
+				}
+				tzCylinderFillingDto.setTzCylinderAfterCheckDtoList(tzCylinderAfterCheckDtoListResult);
 			}
-			tzCylinderFillingDto.setTzCylinderAfterCheckDtoList(tzCylinderAfterCheckDtoListResult);
 		}
 
 		if(!ValidationUtil.isEmpty(tzCylinderFillingDtoList)){