提交

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

@@ -332,12 +332,13 @@ public class TaBuildingController extends BaseController {
     @RequestMapping(value = "/wx/buildingSelectId/{id}", method = RequestMethod.GET)
     public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id,HttpServletRequest request){
         String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == persons || persons.size() == 0) {
             return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = persons.get(0);
-        return taBuildingService.buildingAllSelectId(id,person.getPersonId());
+        return taBuildingService.buildingAllSelectId(id,person.getPersonId(), orgId);
     }
     /**
      * 查询当前所有项目

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

@@ -31,7 +31,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     List<TaPerson> getPersonByOpenId(@Param("openId") String openId);
 
-    List<Map<String, Object>> selectBuildingConsultants(@Param("buildingId") String buildingId, @Param("personType") String personType, @Param("status") int status);
+    List<Map<String, Object>> selectBuildingConsultants(@Param("buildingId") String buildingId, @Param("personType") String personType, @Param("status") int status, @Param("orgId") Integer orgId);
 
     IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
 

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

@@ -45,7 +45,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param id
      * @return
      */
-    ResponseBean buildingAllSelectId(String id,String personId);
+    ResponseBean buildingAllSelectId(String id,String personId, Integer orgId);
 
 
     /**

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

@@ -148,7 +148,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAllSelectId(String id,String personId) {
+    public ResponseBean buildingAllSelectId(String id,String personId, Integer orgId) {
         // 查询基础信息
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().gt(TaBuilding::getStatus,-1);
@@ -528,7 +528,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         IPage<TaShare> taShareList = taShareMapper.selectPage(pg, taShareQueryWrapper);
         build.setShareList(taShareList);
 
-        build.setConsultants(taPersonMapper.selectBuildingConsultants(build.getBuildingId(), CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL));
+        build.setConsultants(taPersonMapper.selectBuildingConsultants(build.getBuildingId(), CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL, build.getOrgId()));
     }
 
     @Override

src/main/resources/mapper/TaPersonMapper.xml

@@ -47,6 +47,8 @@
             s.building_id = #{buildingId}
         AND t.person_type = #{personType}
         AND t. STATUS = #{status}
+        and t.org_id = #{orgId}
+        and u.org_id = #{orgId}
         ORDER BY
             t.create_date DESC
     </select>