修改气瓶tag

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

@@ -174,6 +174,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 		TzCylinderProduceDto tzCylinderProduceDto = tzCylinderMapper.getTzCylinderProduceDto(orgCode);
 		TzCylinderTagsDto tzCylinderTagsDto = tzCylinderMapper.getTzCylinderTagsDto(orgCode);
 		CylinderFileUrlDto dto =new CylinderFileUrlDto();
+		if (!ValidationUtil.isEmpty(tzCylinderProduceDto)) {
 		if (!ValidationUtil.isEmpty(tzCylinderProduceDto.getProductQualified())) {
 			String productQualified = tzCylinderProduceDto.getProductQualified();
 			List<Map> productQualifiedList = getMaps(productQualified);
@@ -183,7 +184,6 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 			String proofQuality = tzCylinderProduceDto.getProofQuality();
 			List<Map> proofQualityList = getMaps(proofQuality);
 			dto.setProofQuality(proofQualityList);
-
 		}
 		if (!ValidationUtil.isEmpty(tzCylinderProduceDto.getSupervisionInspec())) {
 			String supervisionInspec = tzCylinderProduceDto.getSupervisionInspec();
@@ -195,7 +195,8 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 			List<Map> typeExperimentsList = getMaps(typeExperiments);
 			dto.setTypeExperiments(typeExperimentsList);
 		}
-		if (!ValidationUtil.isEmpty(tzCylinderTagsDto.getGasCylinderStamp())) {
+		}
+		if (!ValidationUtil.isEmpty(tzCylinderTagsDto)&&!ValidationUtil.isEmpty(tzCylinderTagsDto.getGasCylinderStamp())) {
 			String gasCylinderStamp = tzCylinderTagsDto.getGasCylinderStamp();
 			List<Map> gasCylinderStampList = getMaps(gasCylinderStamp);
 			dto.setGasCylinderStamp(gasCylinderStampList);
@@ -205,6 +206,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 
 	public List<Map> getMaps(String o){
 		List list=new ArrayList();
+		if (!ValidationUtil.isEmpty(o)) {
 			JSONArray jsonArray = JSONArray.parseArray(o);
 			for (Object li : jsonArray) {
 				JSONObject objects = JSONObject.parseObject(li.toString());
@@ -213,7 +215,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 				map.put("name",objects.getString("fileName"));
 				list.add(map);
 			}
-
+		}
 		return list;
 	}
 }