胡轶钦 5 vuotta sitten
vanhempi
commit
320aa01a74

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java Näytä tiedosto

204
 //            @RequestParam(required = false) Double maxBuildingArea, // 最大面积
204
 //            @RequestParam(required = false) Double maxBuildingArea, // 最大面积
205
             HttpServletRequest request
205
             HttpServletRequest request
206
     ){
206
     ){
207
+        Integer orgId = getOrgId(request);
207
         List<String> targets = null;
208
         List<String> targets = null;
208
         if (null != mine && mine) {
209
         if (null != mine && mine) {
209
             String openid = JWTUtils.getSubject(request);
210
             String openid = JWTUtils.getSubject(request);
220
         List<String[]> priceList = getParamListOf(price);
221
         List<String[]> priceList = getParamListOf(price);
221
         List<String[]> areaList = getParamListOf(area);
222
         List<String[]> areaList = getParamListOf(area);
222
 
223
 
223
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList);
224
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId);
224
     }
225
     }
225
 
226
 
226
 
227
 

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Näytä tiedosto

103
                                                @RequestParam(value = "cityId", required = false)Integer cityId,
103
                                                @RequestParam(value = "cityId", required = false)Integer cityId,
104
                                                HttpServletRequest request){
104
                                                HttpServletRequest request){
105
         String openid = JWTUtils.getSubject(request);
105
         String openid = JWTUtils.getSubject(request);
106
+        Integer orgId = getOrgId(request);
106
         ResponseBean  responseBean = new ResponseBean();
107
         ResponseBean  responseBean = new ResponseBean();
107
         if(mine){
108
         if(mine){
108
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
109
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
112
             TaPerson person = taPersons.get(0);
113
             TaPerson person = taPersons.get(0);
113
             responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNum,pageSize,"",person));
114
             responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNum,pageSize,"",person));
114
         }else {
115
         }else {
115
-            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid,cityId);
116
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid,cityId,orgId);
116
         }
117
         }
117
 
118
 
118
         return responseBean;
119
         return responseBean;

+ 1
- 0
src/main/java/com/huiju/estateagents/controller/TaNewsController.java Näytä tiedosto

88
                                      HttpServletRequest request
88
                                      HttpServletRequest request
89
     ){
89
     ){
90
         List<String> targets = new ArrayList<>();
90
         List<String> targets = new ArrayList<>();
91
+
91
         if (null != mine && mine) {
92
         if (null != mine && mine) {
92
             String openid = JWTUtils.getSubject(request);
93
             String openid = JWTUtils.getSubject(request);
93
             List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
94
             List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);

+ 2
- 1
src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java Näytä tiedosto

75
                                          @Param("houseTypeList") String[] houseTypeList,
75
                                          @Param("houseTypeList") String[] houseTypeList,
76
                                          @Param("buildingTypeList") String[] buildingTypeList,
76
                                          @Param("buildingTypeList") String[] buildingTypeList,
77
                                          @Param("priceList") List<String[]> priceList,
77
                                          @Param("priceList") List<String[]> priceList,
78
-                                         @Param("areaList") List<String[]> areaList);
78
+                                         @Param("areaList") List<String[]> areaList,
79
+                                         @Param("orgId")Integer orgId);
79
 
80
 
80
 }
81
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java Näytä tiedosto

38
      * 微信小程序 项目动态管理列表
38
      * 微信小程序 项目动态管理列表
39
      * @return
39
      * @return
40
      */
40
      */
41
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId);
41
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId);
42
 
42
 
43
     /**
43
     /**
44
      * 微信小程序 项目详情
44
      * 微信小程序 项目详情

+ 2
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingService.java Näytä tiedosto

126
             String[] houseTypeList,
126
             String[] houseTypeList,
127
             String[] buildingTypeList,
127
             String[] buildingTypeList,
128
             List<String[]> priceList,
128
             List<String[]> priceList,
129
-            List<String[]> areaList);
129
+            List<String[]> areaList,
130
+            Integer orgId);
130
 
131
 
131
     /**
132
     /**
132
      * 微信小程序 楼盘列表
133
      * 微信小程序 楼盘列表

+ 2
- 1
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Näytä tiedosto

93
     }
93
     }
94
 
94
 
95
     @Override
95
     @Override
96
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId) {
96
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId) {
97
         Page<TaBuildingDynamic> page = new Page<>();
97
         Page<TaBuildingDynamic> page = new Page<>();
98
         page.setCurrent(pageNum);
98
         page.setCurrent(pageNum);
99
         page.setSize(pageSize);
99
         page.setSize(pageSize);
107
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
107
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
108
         buildingDynamicQueryWrapper.eq("status", "1");
108
         buildingDynamicQueryWrapper.eq("status", "1");
109
         buildingDynamicQueryWrapper.eq(null != cityId,"city_id",cityId);
109
         buildingDynamicQueryWrapper.eq(null != cityId,"city_id",cityId);
110
+        buildingDynamicQueryWrapper.eq("org_id",orgId);
110
         buildingDynamicQueryWrapper.orderByDesc("weight","create_date");
111
         buildingDynamicQueryWrapper.orderByDesc("weight","create_date");
111
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
112
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
112
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
113
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();

+ 3
- 2
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Näytä tiedosto

391
             String[] houseTypeList,
391
             String[] houseTypeList,
392
             String[] buildingTypeList,
392
             String[] buildingTypeList,
393
             List<String[]> priceList,
393
             List<String[]> priceList,
394
-            List<String[]> areaList) {
394
+            List<String[]> areaList,
395
+            Integer orgId) {
395
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
396
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
396
 
397
 
397
         if(CollectionUtils.isEmpty(targets) && mine){
398
         if(CollectionUtils.isEmpty(targets) && mine){
409
 //
410
 //
410
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
411
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
411
 
412
 
412
-        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList);
413
+        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList,orgId);
413
 
414
 
414
         List<TaBuilding> buildingList = result.getRecords();
415
         List<TaBuilding> buildingList = result.getRecords();
415
         if (CollectionUtils.isNotEmpty(buildingList)) {
416
         if (CollectionUtils.isNotEmpty(buildingList)) {

+ 1
- 0
src/main/resources/mapper/TaBuildingMapper.xml Näytä tiedosto

92
              select * from  ta_building
92
              select * from  ta_building
93
                 WHERE
93
                 WHERE
94
                 `status` = 1
94
                 `status` = 1
95
+                and org_id = #{orgId}
95
                 <if test="cityId != null">
96
                 <if test="cityId != null">
96
                     AND city_id = #{cityId}
97
                     AND city_id = #{cityId}
97
                 </if>
98
                 </if>