* 代码优化

src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java

@@ -123,17 +123,19 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper;
         QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
         for (TaBuildingApartment apartment : apartmentList) {
-            apartmentImgQueryWrapper = new QueryWrapper<>();
-            apartmentImgQueryWrapper.eq("apartment_id", apartment.getApartmentId());
-            buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
-            for (TaApartmentImg apartmentImg : buildingImg) {
-                buildingImgQueryWrapper = new QueryWrapper<>();
-                buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
-                buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
-                buildingImgQueryWrapper.orderByAsc("order_no");
-                taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
-                apartment.setBuildingImgList(taBuildingImgList);
-                resultList.add(apartment);
+            if (!StringUtils.isEmpty(apartment.getApartmentId())) {
+                apartmentImgQueryWrapper = new QueryWrapper<>();
+                apartmentImgQueryWrapper.eq("apartment_id", apartment.getApartmentId());
+                buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
+                for (TaApartmentImg apartmentImg : buildingImg) {
+                    buildingImgQueryWrapper = new QueryWrapper<>();
+                    buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+                    buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                    buildingImgQueryWrapper.orderByAsc("order_no");
+                    taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+                    apartment.setBuildingImgList(taBuildingImgList);
+                    resultList.add(apartment);
+                }
             }
         }
         return resultList;
@@ -167,16 +169,18 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         // 获取户型图片列表
         List<TaBuildingImg> taBuildingImgList = new ArrayList<>();
         List<TaApartmentImg> buildingImg;
-        QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
-        QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper = new QueryWrapper<>();
-        apartmentImgQueryWrapper.eq("apartment_id", resourcesPO.getApartmentId());
-        buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
-        for (TaApartmentImg apartmentImg : buildingImg) {
-            buildingImgQueryWrapper = new QueryWrapper<>();
-            buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
-            buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
-            buildingImgQueryWrapper.orderByAsc("order_no");
-            taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+        if (!StringUtils.isEmpty(resourcesPO.getApartmentId())) {
+            QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
+            QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper = new QueryWrapper<>();
+            apartmentImgQueryWrapper.eq("apartment_id", resourcesPO.getApartmentId());
+            buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
+            for (TaApartmentImg apartmentImg : buildingImg) {
+                buildingImgQueryWrapper = new QueryWrapper<>();
+                buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+                buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                buildingImgQueryWrapper.orderByAsc("order_no");
+                taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+            }
         }
         if (CollectionUtils.isNotEmpty(taBuildingImgList)) {
             resourcesPO.setBuildingImgList(taBuildingImgList);

src/main/java/com/huiju/estateagents/service/impl/TaPreselectionRecordServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaApartmentImg;
 import com.huiju.estateagents.entity.TaBuildingImg;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
@@ -70,16 +71,18 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
             QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper;
             QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
             for (TaPreselectionRecordPO po : poList) {
-                apartmentImgQueryWrapper = new QueryWrapper<>();
-                apartmentImgQueryWrapper.eq("apartment_id", po.getApartmentId());
-                buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
-                for (TaApartmentImg apartmentImg : buildingImg) {
-                    buildingImgQueryWrapper = new QueryWrapper<>();
-                    buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
-                    buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
-                    buildingImgQueryWrapper.orderByAsc("order_no");
-                    taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
-                    po.setBuildingImgList(taBuildingImgList);
+                if (!StringUtils.isEmpty(po.getApartmentId())) {
+                    apartmentImgQueryWrapper = new QueryWrapper<>();
+                    apartmentImgQueryWrapper.eq("apartment_id", po.getApartmentId());
+                    buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
+                    for (TaApartmentImg apartmentImg : buildingImg) {
+                        buildingImgQueryWrapper = new QueryWrapper<>();
+                        buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+                        buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                        buildingImgQueryWrapper.orderByAsc("order_no");
+                        taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+                        po.setBuildingImgList(taBuildingImgList);
+                    }
                 }
                 resultList.add(po);
             }