Bläddra i källkod

Merge remote-tracking branch 'origin/dev' into dev

顾绍勇 5 år sedan
förälder
incheckning
55a4a4b372

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaSalesBatchController.java Visa fil

196
 
196
 
197
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
197
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
198
             queryWrapper.eq("org_id",getOrgId(request));
198
             queryWrapper.eq("org_id",getOrgId(request));
199
-            queryWrapper.eq("content_type",CommConstant.HOUSE);
199
+            queryWrapper.eq("content_type",CommConstant.SALES_BATCH);
200
             queryWrapper.eq("target_id",taSalesBatch.getSalesBatchId());
200
             queryWrapper.eq("target_id",taSalesBatch.getSalesBatchId());
201
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
201
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
202
             if (CommConstant.NOT_PUBLISH.equals(taSalesBatch.getStatus())){
202
             if (CommConstant.NOT_PUBLISH.equals(taSalesBatch.getStatus())){

+ 1
- 0
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Visa fil

445
             //更新直播城市
445
             //更新直播城市
446
             TaLiveActivity taLiveActivity = new TaLiveActivity();
446
             TaLiveActivity taLiveActivity = new TaLiveActivity();
447
             taLiveActivity.setCityId(building.getCityId());
447
             taLiveActivity.setCityId(building.getCityId());
448
+            taLiveActivity.setBuildingId(building.getBuildingId());
448
             QueryWrapper<TaLiveActivity> taLiveActivityQueryWrapper = new QueryWrapper<>();
449
             QueryWrapper<TaLiveActivity> taLiveActivityQueryWrapper = new QueryWrapper<>();
449
             taLiveActivityQueryWrapper.eq("building_id", building.getBuildingId());
450
             taLiveActivityQueryWrapper.eq("building_id", building.getBuildingId());
450
             taLiveActivityMapper.update(taLiveActivity, taLiveActivityQueryWrapper);
451
             taLiveActivityMapper.update(taLiveActivity, taLiveActivityQueryWrapper);