优化代码

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java

@@ -149,14 +149,14 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 				Map<String,String> scaleMap = new HashMap<>();
 				if(CollectionUtil.isNotEmpty(hygfCommercialScaleList)){
 					for (Map<String, Object> stringStringMap : hygfCommercialScaleList) {
-						scaleMap.put(String.valueOf(stringStringMap.get("peasant_household_no")),String.valueOf(stringStringMap.get("scale")));
+						scaleMap.put(String.valueOf(stringStringMap.get("peasant_household_no")),StringUtils.isEmpty(String.valueOf(stringStringMap.get("scale"))) ? "" : String.valueOf(stringStringMap.get("scale")));
 					}
 				}
 				List<Map<String, Object>> realScaleByPeasantHouseholdNoList = powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNoList(powerStationCodeList);
 				Map<String,String> realScaleMap = new HashMap<>();
 				if(CollectionUtil.isNotEmpty(realScaleByPeasantHouseholdNoList)){
 					for (Map<String, Object> stringStringMap : realScaleByPeasantHouseholdNoList) {
-						realScaleMap.put(String.valueOf(stringStringMap.get("peasant_household_no")),String.valueOf(stringStringMap.get("realScale")));
+						realScaleMap.put(String.valueOf(stringStringMap.get("peasant_household_no")),StringUtils.isEmpty(String.valueOf(stringStringMap.get("realScale"))) ? "" : String.valueOf(stringStringMap.get("realScale")));
 					}
 				}
 				records.forEach(e -> {
@@ -426,7 +426,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
             powerStation.setNextExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds());
             powerStation.setNextNodeName(basicGridAcceptance.getNextNodeName());
             powerStationService.savePowerStation(powerStation, flag, powerStation.getOwnersName(), meg);
-            
+
 			//更新待办
 //			WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
 //			workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());