傅行帆 5 年前
父节点
当前提交
6d0ce13d4f

+ 5
- 1
src/main/java/com/huiju/estateagents/service/impl/TsConsultantKpiServiceImpl.java 查看文件

106
 
106
 
107
     @Override
107
     @Override
108
     public IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
108
     public IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
109
+        String personId = null;
109
         TaPerson taPerson = taPersonMapper.selectOne(new QueryWrapper<TaPerson>().eq("user_id", userId).eq("org_id", orgId));
110
         TaPerson taPerson = taPersonMapper.selectOne(new QueryWrapper<TaPerson>().eq("user_id", userId).eq("org_id", orgId));
110
-        return taRecommendCustomerMapper.getCustomerListOfConsultant(page, orgId, userId, buildingId, startDate, endDate, taPerson.getPersonId());
111
+        if (null != taPerson){
112
+            personId = taPerson.getPersonId();
113
+        }
114
+        return taRecommendCustomerMapper.getCustomerListOfConsultant(page, orgId, userId, buildingId, startDate, endDate, personId);
111
     }
115
     }
112
 
116
 
113
     @Override
117
     @Override

+ 5
- 1
src/main/resources/mapper/TaRecommendCustomerMapper.xml 查看文件

842
         from ta_recommend_customer s
842
         from ta_recommend_customer s
843
         left join ta_person t on t.person_id = s.person_id
843
         left join ta_person t on t.person_id = s.person_id
844
         where s.org_id = #{orgId}
844
         where s.org_id = #{orgId}
845
-        and (s.realty_consultant = #{userId} or s.realty_consultant = #{personId})
845
+        and (s.realty_consultant = #{userId}
846
+        <if test="personId != null">
847
+            or s.realty_consultant = #{personId}
848
+        </if>
849
+        )
846
         <if test="startDate != null">
850
         <if test="startDate != null">
847
             and s.create_date BETWEEN #{startDate} and #{endDate}
851
             and s.create_date BETWEEN #{startDate} and #{endDate}
848
         </if>
852
         </if>