Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

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

@@ -448,7 +448,7 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
-    @GetMapping("/admin/customer/recommend/")
+    @GetMapping("/admin/customer/recommend/drift")
     public ResponseBean getDriftCustomerList (HttpServletRequest request,
                                               @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,

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

@@ -84,14 +84,17 @@ public class TdBuildingTypeController extends BaseController {
      */
     @RequestMapping(value="/wx/tdBuildingType",method= RequestMethod.GET)
     public ResponseBean tdWxBuildingTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
         try {
             //使用分页插件
             IPage<TdBuildingType> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("status", 1);
             queryWrapper.orderByDesc("create_date");
+            queryWrapper.eq("org_id",orgId);
 
             IPage<TdBuildingType> result = iTdBuildingTypeService.page(pg, queryWrapper);
             responseBean.addSuccess(result);