批量生成时增加空值判断

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java

@@ -401,7 +401,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
 
         for (EpidemicBuildingUnitDTO house : houseList) {
             try {
-                BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + house.getUnit() + house.getRoomNo(),
+                BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + StrConstant.HYPHEN + house.getUnit() + StrConstant.HYPHEN + house.getRoomNo(),
                         urlRre + house.getRoomCode());
 
                 byte[] buf = new byte[8192];
@@ -431,7 +431,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
             }
             //url组成:小程序地址?房屋编码
             String url = qrCodeProperties.getPre() + house.getRoomCode();
-            BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + house.getUnit() + house.getRoomNo(), url);
+            BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + StrConstant.HYPHEN + house.getUnit() + StrConstant.HYPHEN + house.getRoomNo(), url);
             //BufferedImage 转 InputStream
             ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
             ImageOutputStream imageOutput = ImageIO.createImageOutputStream(byteArrayOutputStream);
@@ -724,7 +724,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
     public Result<HouseInfoResultDTO> getHouseInfo(GetHouseInfoFormDTO formDTO) {
         HouseInfoResultDTO houseInfoResultDTO = baseDao.getHouseInfo(formDTO);
 
-        if(houseInfoResultDTO != null){
+        if (houseInfoResultDTO != null) {
             List<FamilyMemberInfoResultDTO> members = epidemicUnitOwnerDao.getFamilyMemberInfoByUnitId(houseInfoResultDTO.getId());
             houseInfoResultDTO.setMembers(members);
         }
@@ -737,7 +737,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
         //url组成:小程序地址?房屋编码
         String url = qrCodeProperties.getPre() + house.getRoomCode();
         String fileName = house.getBuildingName() + StrConstant.HYPHEN + house.getUnit() + StrConstant.HYPHEN + house.getRoomNo() + ".png";
-        BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + house.getUnit() + house.getRoomNo(), url);
+        BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + StrConstant.HYPHEN + house.getUnit() + StrConstant.HYPHEN + house.getRoomNo(), url);
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         try {
             ImageIO.write(image, "png", out);

epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml

@@ -101,7 +101,7 @@
         LEFT JOIN epidemic_plot_coordinate p ON b.PLOT_ID = p.id
         WHERE
         u.DEL_FLAG = '0'
-        AND u.MA_URL IS NULL
+        AND (u.MA_URL IS NULL OR u.MA_URL = '')
     </select>
 
     <select id="listUnitHasCode" resultType="com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO">