魏熙美 5 лет назад
Родитель
Сommit
ef93631851

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java Просмотреть файл

@@ -108,7 +108,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
108 108
      * @param endDate
109 109
      * @return
110 110
      */
111
-    List<Map<String, Object>> selectNewsUserCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
111
+    List<Map<String, Object>> selectNewsUserCount(@Param("orgId") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
112 112
 
113 113
     /**
114 114
      * 性别比例

+ 2
- 2
src/main/resources/mapper/TaPersonMapper.xml Просмотреть файл

@@ -296,7 +296,7 @@ FROM
296 296
                         tp.create_date as create_date
297 297
                     FROM
298 298
                       ta_person tp
299
-                    where ifnull(tp.person_type, '') != #{personType}
299
+                    where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
300 300
                     and tp.phone is NOT NULL
301 301
                     <if test="startDate != null or endDate != null">
302 302
                         AND tp.create_date BETWEEN #{startDate} and #{endDate}
@@ -334,7 +334,7 @@ FROM
334 334
                     tp.create_date as create_date
335 335
                 FROM
336 336
                  ta_person tp
337
-                where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
337
+                where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
338 338
                 <if test="startDate != null or endDate != null">
339 339
                     AND tp.create_date BETWEEN #{startDate} and #{endDate}
340 340
                 </if>

+ 1
- 1
src/main/resources/mapper/TaRecommendCustomerMapper.xml Просмотреть файл

@@ -158,7 +158,7 @@ FROM
158 158
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
159 159
         <where>
160 160
             a.status > 0
161
-            and realty_consultant is not null
161
+            and a.realty_consultant is not null
162 162
             <if test="orgId != null">
163 163
                 and a.org_id = #{orgId}
164 164
             </if>