* 代码优化

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

@@ -123,19 +123,17 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper;
         QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
         for (TaBuildingApartment apartment : apartmentList) {
-            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);
-                }
+            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;
@@ -169,18 +167,16 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         // 获取户型图片列表
         List<TaBuildingImg> taBuildingImgList = new ArrayList<>();
         List<TaApartmentImg> buildingImg;
-        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);
-            }
+        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

@@ -71,18 +71,16 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
             QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper;
             QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
             for (TaPreselectionRecordPO po : poList) {
-                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);
-                    }
+                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);
             }