顾绍勇 5 vuotta sitten
vanhempi
commit
b5e632643b

+ 3
- 2
src/main/java/com/huiju/estateagents/service/impl/TsConsultantKpiServiceImpl.java Näytä tiedosto

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

+ 0
- 1
src/main/resources/mapper/TsConsultantKpiMapper.xml Näytä tiedosto

@@ -145,7 +145,6 @@
145 145
         WHERE
146 146
             p.org_id = #{orgId}
147 147
             AND p.`status` > 0
148
-
149 148
             AND p.create_date BETWEEN STR_TO_DATE( #{startDate}, '%Y%m%d')
150 149
             AND  STR_TO_DATE(concat(#{endDate}, '235959'), '%Y%m%d%H%i%s')
151 150
         <if test="buildingIds != null">