合并

whole-estate/src/main/java/com/example/wholeestate/controller/BuildingController.java

@@ -257,8 +257,7 @@ public class BuildingController extends BaseController {
 
     @ApiOperation(value = "户型删除", notes = "户型删除")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "buildingId:楼盘ID，buildingName:楼盘名称," +
-                    "name:楼盘别名，price:价格，openingDate:开盘时间，coordinate:项目坐标，propertyType:物业类型，dynamic:最新动态，tel:电话,code:樓盤編碼,img:[]多个图片,imgType:图片类型，orderNo：排序\"")
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:楼盘ID ")
 
     })
     @RequestMapping(value = "/building/deleted", method = RequestMethod.DELETE)

whole-estate/src/main/java/com/example/wholeestate/service/impl/BuildingServiceImpl.java

@@ -80,12 +80,13 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     public ResponseBean buildingSelectId(String id) {
         ResponseBean response= new ResponseBean();
         QueryWrapper<Building> buildingtWrapper = new QueryWrapper<>();
-        buildingtWrapper.lambda().eq(Building::getStatus,0);
+        buildingtWrapper.lambda().eq(Building::getStatus,1);
         buildingtWrapper.lambda().eq(Building::getBuildingId,id);
         Building building= buildingMapper.selectOne(buildingtWrapper);
         //查询当前图片
         QueryWrapper<BuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
-        BuildingImgQueryWrapper.eq("building_id", building.getBuildingId());
+        BuildingImgQueryWrapper.eq("building_id", id);
+        BuildingImgQueryWrapper.eq("img_type", "banner");
        List<BuildingImg> buildingImg= buildingImgMapper.selectList(BuildingImgQueryWrapper);
         building.setBuildingImg(buildingImg);
         response.addSuccess(building);
@@ -108,6 +109,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         //图片先删除再添加
         QueryWrapper<BuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
         BuildingImgQueryWrapper.eq("building_id", building.getBuildingId());
+        BuildingImgQueryWrapper.eq("img_type", "banner");
         buildingImgMapper.delete(BuildingImgQueryWrapper);
 
         for (BuildingImg img:buildingImgs){