张延森 5 years ago
parent
commit
a868e9878d

+ 6
- 2
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java View File

263
         try{
263
         try{
264
             IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
264
             IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
265
             QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
265
             QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
266
-            queryWrapper.eq("realty_consultant",person.getPersonId());
267
-           // queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
266
+
267
+            // 2020-4-1 yansen realty_consultant 可能是 person_id, 可能是 user_id
268
+//            queryWrapper.eq("realty_consultant",person.getPersonId());
269
+            queryWrapper.eq("org_id", person.getOrgId());   // 主要是为了走索引
270
+            queryWrapper.nested(query -> query.eq("realty_consultant",person.getPersonId()).or().eq("realty_consultant", person.getUserId()));
271
+            // queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
268
             queryWrapper.gt("status",CommConstant.STATUS_UNACCALIMED);
272
             queryWrapper.gt("status",CommConstant.STATUS_UNACCALIMED);
269
             queryWrapper.orderByDesc("create_date");
273
             queryWrapper.orderByDesc("create_date");
270
             IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
274
             IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);