Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

      * @param endDate
      * @return
      */
-    List<Map<String, Object>> selectNewsUserCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectNewsUserCount(@Param("orgId") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     /**
      * 性别比例

src/main/resources/mapper/TaPersonMapper.xml

                         tp.create_date as create_date
                     FROM
                       ta_person tp
-                    where ifnull(tp.person_type, '') != #{personType}
+                    where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
                     and tp.phone is NOT NULL
                     <if test="startDate != null or endDate != null">
                         AND tp.create_date BETWEEN #{startDate} and #{endDate}
                     tp.create_date as create_date
                 FROM
                  ta_person tp
-                where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
+                where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
                 <if test="startDate != null or endDate != null">
                     AND tp.create_date BETWEEN #{startDate} and #{endDate}
                 </if>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

         LEFT JOIN ta_person c on a.recommend_person = c.person_id
         <where>
             a.status > 0
-            and realty_consultant is not null
+            and a.realty_consultant is not null
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>