소스 검색

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

魏熙美 5 년 전
부모
커밋
aba7320220

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java 파일 보기

448
         return responseBean;
448
         return responseBean;
449
     }
449
     }
450
 
450
 
451
-    @GetMapping("/admin/customer/recommend/")
451
+    @GetMapping("/admin/customer/recommend/drift")
452
     public ResponseBean getDriftCustomerList (HttpServletRequest request,
452
     public ResponseBean getDriftCustomerList (HttpServletRequest request,
453
                                               @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
453
                                               @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
454
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
454
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,

+ 4
- 1
src/main/java/com/huiju/estateagents/controller/TdBuildingTypeController.java 파일 보기

84
      */
84
      */
85
     @RequestMapping(value="/wx/tdBuildingType",method= RequestMethod.GET)
85
     @RequestMapping(value="/wx/tdBuildingType",method= RequestMethod.GET)
86
     public ResponseBean tdWxBuildingTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
86
     public ResponseBean tdWxBuildingTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
87
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
87
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
88
+                                             HttpServletRequest request){
88
         ResponseBean responseBean = new ResponseBean();
89
         ResponseBean responseBean = new ResponseBean();
90
+        Integer orgId = getOrgId(request);
89
         try {
91
         try {
90
             //使用分页插件
92
             //使用分页插件
91
             IPage<TdBuildingType> pg = new Page<>(pageNum, pageSize);
93
             IPage<TdBuildingType> pg = new Page<>(pageNum, pageSize);
92
             QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
94
             QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
93
             queryWrapper.eq("status", 1);
95
             queryWrapper.eq("status", 1);
94
             queryWrapper.orderByDesc("create_date");
96
             queryWrapper.orderByDesc("create_date");
97
+            queryWrapper.eq("org_id",orgId);
95
 
98
 
96
             IPage<TdBuildingType> result = iTdBuildingTypeService.page(pg, queryWrapper);
99
             IPage<TdBuildingType> result = iTdBuildingTypeService.page(pg, queryWrapper);
97
             responseBean.addSuccess(result);
100
             responseBean.addSuccess(result);