Merge remote-tracking branch 'origin/developer_bw' into developer_bw

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

@@ -1339,17 +1339,14 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         }
         //更新并网信息
         HygfOnGrid hygfOnGrid = surveyInfoAllDto.getHygfOnGrid();
-        if(Objects.nonNull(hygfOnGrid)){
             hygfOnGrid.setPeasantHouseholdId( peasantHousehold.getSequenceNbr());
             // 避免生成多份数据
             hygfOnGridService.saveOrUpdate(hygfOnGrid, new LambdaQueryWrapper<HygfOnGrid>()
                     .eq(HygfOnGrid::getPeasantHouseholdId, peasantHousehold.getSequenceNbr()));
             hygfOnGridService.saveOrUpdate(hygfOnGrid);
-        }
         //更新设计信息
         DesignInformationDto designInformationDto = surveyInfoAllDto.getDesignInformation();
 
-        if(Objects.nonNull(designInformationDto)){
         DesignInformation    designInformation =  BeanDtoUtils.convert(designInformationDto,
                     DesignInformation.class);
             designInformation.setPeasantHouseholdId(String.valueOf(peasantHousehold.getSequenceNbr()));
@@ -1358,6 +1355,4 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
 
     }
-
-    }
 }
\ No newline at end of file