顾绍勇 5 年前
父节点
当前提交
a8a85b9090
共有 1 个文件被更改,包括 8 次插入3 次删除
  1. 8
    3
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

+ 8
- 3
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java 查看文件

151
 //        Page<TaBuilding> page = new Page<>();
151
 //        Page<TaBuilding> page = new Page<>();
152
 //        page.setSize(pageSize == null ? 10 : pageSize);
152
 //        page.setSize(pageSize == null ? 10 : pageSize);
153
 //        page.setCurrent(pageNum == null ? 1 : pageNum);
153
 //        page.setCurrent(pageNum == null ? 1 : pageNum);
154
-        List<TaBuilding> building = taBuildingMapper.buildingListSelect(name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId,taPersonBuildingList);
154
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(name, code, startDate, buildingStatus, marketStatus, cityId, isMain, orgId, taPersonBuildingList);
155
 //        page.setRecords(building);
155
 //        page.setRecords(building);
156
         return ResponseBean.success(building);
156
         return ResponseBean.success(building);
157
     }
157
     }
225
         if (null == building) {
225
         if (null == building) {
226
             return ResponseBean.error("项目不存在", ResponseBean.ERROR_UNAVAILABLE);
226
             return ResponseBean.error("项目不存在", ResponseBean.ERROR_UNAVAILABLE);
227
         }
227
         }
228
+
229
+        if (1 != building.getStatus()) {
230
+            return ResponseBean.error("项目未发布", ResponseBean.ERROR_UNAVAILABLE);
231
+        }
232
+
228
         //查询当前图片
233
         //查询当前图片
229
         building.setBuildingImg(getBuildingImg(id, CommConstant.BUILDING_IMG_BANNER));
234
         building.setBuildingImg(getBuildingImg(id, CommConstant.BUILDING_IMG_BANNER));
230
 
235
 
298
 
303
 
299
         // TODO 直播活动
304
         // TODO 直播活动
300
         QueryWrapper<TaLiveActivity> liveActivityQueryWrapper = new QueryWrapper<>();
305
         QueryWrapper<TaLiveActivity> liveActivityQueryWrapper = new QueryWrapper<>();
301
-        liveActivityQueryWrapper.eq("building_id",id);
302
-        liveActivityQueryWrapper.eq("status",1);
306
+        liveActivityQueryWrapper.eq("building_id", id);
307
+        liveActivityQueryWrapper.eq("status", 1);
303
         List<TaLiveActivity> liveActivityList = taLiveActivityMapper.selectList(liveActivityQueryWrapper);
308
         List<TaLiveActivity> liveActivityList = taLiveActivityMapper.selectList(liveActivityQueryWrapper);
304
         building.setLiveActivityList(liveActivityList);
309
         building.setLiveActivityList(liveActivityList);
305
 
310