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

src/main/java/com/huiju/estateagents/controller/TaSalesBatchController.java

@@ -196,7 +196,7 @@ public class TaSalesBatchController extends BaseController {
 
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.eq("content_type",CommConstant.HOUSE);
+            queryWrapper.eq("content_type",CommConstant.SALES_BATCH);
             queryWrapper.eq("target_id",taSalesBatch.getSalesBatchId());
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
             if (CommConstant.NOT_PUBLISH.equals(taSalesBatch.getStatus())){

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

@@ -445,6 +445,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             //更新直播城市
             TaLiveActivity taLiveActivity = new TaLiveActivity();
             taLiveActivity.setCityId(building.getCityId());
+            taLiveActivity.setBuildingId(building.getBuildingId());
             QueryWrapper<TaLiveActivity> taLiveActivityQueryWrapper = new QueryWrapper<>();
             taLiveActivityQueryWrapper.eq("building_id", building.getBuildingId());
             taLiveActivityMapper.update(taLiveActivity, taLiveActivityQueryWrapper);