orgId

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

@@ -204,6 +204,7 @@ public class TaBuildingController extends BaseController {
 //            @RequestParam(required = false) Double maxBuildingArea, // 最大面积
             HttpServletRequest request
     ){
+        Integer orgId = getOrgId(request);
         List<String> targets = null;
         if (null != mine && mine) {
             String openid = JWTUtils.getSubject(request);
@@ -220,7 +221,7 @@ public class TaBuildingController extends BaseController {
         List<String[]> priceList = getParamListOf(price);
         List<String[]> areaList = getParamListOf(area);
 
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList);
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId);
     }
 
 

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

@@ -103,6 +103,7 @@ public class TaBuildingDynamicController extends BaseController {
                                                @RequestParam(value = "cityId", required = false)Integer cityId,
                                                HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
+        Integer orgId = getOrgId(request);
         ResponseBean  responseBean = new ResponseBean();
         if(mine){
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -112,7 +113,7 @@ public class TaBuildingDynamicController extends BaseController {
             TaPerson person = taPersons.get(0);
             responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNum,pageSize,"",person));
         }else {
-            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid,cityId);
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid,cityId,orgId);
         }
 
         return responseBean;

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

@@ -88,6 +88,7 @@ public class TaNewsController extends BaseController {
                                      HttpServletRequest request
     ){
         List<String> targets = new ArrayList<>();
+
         if (null != mine && mine) {
             String openid = JWTUtils.getSubject(request);
             List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -75,6 +75,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
                                          @Param("houseTypeList") String[] houseTypeList,
                                          @Param("buildingTypeList") String[] buildingTypeList,
                                          @Param("priceList") List<String[]> priceList,
-                                         @Param("areaList") List<String[]> areaList);
+                                         @Param("areaList") List<String[]> areaList,
+                                         @Param("orgId")Integer orgId);
 
 }

src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java

@@ -38,7 +38,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 微信小程序 项目动态管理列表
      * @return
      */
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId);
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId);
 
     /**
      * 微信小程序 项目详情

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -126,7 +126,8 @@ public interface ITaBuildingService extends IService<TaBuilding> {
             String[] houseTypeList,
             String[] buildingTypeList,
             List<String[]> priceList,
-            List<String[]> areaList);
+            List<String[]> areaList,
+            Integer orgId);
 
     /**
      * 微信小程序 楼盘列表

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

@@ -93,7 +93,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId) {
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
@@ -107,6 +107,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
         buildingDynamicQueryWrapper.eq("status", "1");
         buildingDynamicQueryWrapper.eq(null != cityId,"city_id",cityId);
+        buildingDynamicQueryWrapper.eq("org_id",orgId);
         buildingDynamicQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();

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

@@ -391,7 +391,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             String[] houseTypeList,
             String[] buildingTypeList,
             List<String[]> priceList,
-            List<String[]> areaList) {
+            List<String[]> areaList,
+            Integer orgId) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
         if(CollectionUtils.isEmpty(targets) && mine){
@@ -409,7 +410,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 //
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
 
-        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList);
+        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList,orgId);
 
         List<TaBuilding> buildingList = result.getRecords();
         if (CollectionUtils.isNotEmpty(buildingList)) {

src/main/resources/mapper/TaBuildingMapper.xml

@@ -92,6 +92,7 @@
              select * from  ta_building
                 WHERE
                 `status` = 1
+                and org_id = #{orgId}
                 <if test="cityId != null">
                     AND city_id = #{cityId}
                 </if>