bugfix

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

@@ -161,7 +161,7 @@ public class TaBuildingDynamicController extends BaseController {
                 return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaPerson person = taPersons.get(0);
-            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person));
+            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person,orgId));
         }else {
             responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
         }

src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java

@@ -176,6 +176,9 @@ public class TaRecommendCustomer implements Serializable {
     @TableField(exist = false)
     private String recommendTel;
 
+    @TableField(exist = false)
+    private String intentionName;
+
     /**
      * 推广人
      */

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

@@ -83,7 +83,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      */
     ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId,String isCheckin,String name,String phone);
 
-    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
+    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person,Integer orgId);
 
     void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson);
 

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

@@ -357,9 +357,10 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person){
+    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person,Integer orgId){
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
         activityDynamicEnlistQueryWrapper.eq("phone",person.getPhone());
+        activityDynamicEnlistQueryWrapper.eq("org_id",orgId);
         if(!StringUtils.isEmpty(building)){
             activityDynamicEnlistQueryWrapper.eq("building_id",building);
         }

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -106,10 +106,12 @@ FROM
         a.*,
         a.customer_id AS customerId,
         b.NAME AS consultantName,
-        b.tel AS consultTel
+        b.tel AS consultTel,
+        c.building_name as intentionName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
             and a.report_recommend_status = 1