提交

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

@@ -134,10 +134,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
      */
     private List<TaBuildingImg> getBuildingImg(String buildingId, String imgType) {
         //查询当前图片
-        QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
-        BuildingImgQueryWrapper.eq("building_id", buildingId);
-        BuildingImgQueryWrapper.eq("img_type", imgType);
-        List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(BuildingImgQueryWrapper);
+        QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
+        buildingImgQueryWrapper.eq("building_id", buildingId);
+        buildingImgQueryWrapper.eq("img_type", imgType);
+        buildingImgQueryWrapper.orderByAsc("order_no");
+        List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
         return  buildingImg.size() > 0 ? buildingImg : null;
     }
 
@@ -406,7 +407,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         // 视频封面图
         String videoImage = object.getString("videoImage");
-        List<TaBuildingImg> videoImageList = JSONObject.parseArray(imgStr, TaBuildingImg.class);
+        List<TaBuildingImg> videoImageList = JSONObject.parseArray(videoImage, TaBuildingImg.class);
         if (CollectionUtils.isNotEmpty(videoImageList)) {
             videoImageList = insertImgBatch(videoImageList, building.getBuildingId());
         }
@@ -748,14 +749,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingApartmentQueryWrapper.eq("apartment_id", id);
         TaBuildingApartment buildingApartment = taBuildingApartmentMapper.selectOne(buildingApartmentQueryWrapper);
 
-        TaBuilding  building= new TaBuilding();
+//        TaBuilding  building= new TaBuilding();
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,buildingApartment.getBuildingId());
-        TaBuilding bui= taBuildingMapper.selectOne(buildingtWrapper);
-
-        if (bui.getStatus().equals(1)){
-            return ResponseBean.error("楼盘已发布不可以删除", ResponseBean.ERROR_UNAVAILABLE);
-        }
+//        TaBuilding bui= taBuildingMapper.selectOne(buildingtWrapper);
+//        if (bui.getStatus().equals(1)){
+//            return ResponseBean.error("楼盘已发布不可以删除", ResponseBean.ERROR_UNAVAILABLE);
+//        }
 
         buildingApartment.setStatus(-1);
        taBuildingApartmentMapper.update(buildingApartment,buildingApartmentQueryWrapper);