bug fix

src/main/resources/mapper/ActivityManageMapper.xml

@@ -49,7 +49,7 @@
         ) as visit_num,
 
         -- 分享新增用户
-        (select count(*) from ta_share_person_from f
+        (select count(DISTINCT f.person_id) from ta_share_person_from f
         where	f.org_id = a.org_id
         <choose>
             <when test=" type == 'live'">
@@ -65,7 +65,7 @@
         ) as new_persons,
 
         -- 分享新增客户
-        (select count(*) from ta_share_person_from g
+        (select count(DISTINCT g.person_id) from ta_share_person_from g
         inner join ta_person h on h.person_id = g.person_id
         where	g.org_id = a.org_id
         <choose>

src/main/resources/mapper/TaChannelMapper.xml

@@ -1,67 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huiju.estateagents.mapper.TaChannelMapper">
-
-    <select id="channelCode" resultType="int">
-        drop FUNCTION if exists roundNum;
-        create function roundNum() returns int
-        begin
-        declare x int default 1;
-        declare y int default 0;
-        declare a int default 20;
-        declare b int default 1;
-        while (b <![CDATA[ < a ]]> ) do
-        set x = (select (select FLOOR(100000 + RAND()*900000))  as num);
-        set y = (select count(1) from ta_channel where channel_code = x);
-        if y = 0
-        then return x;
-        END IF;
-        set b = b + 1;
-        end while;
-        return 0;
-        end;
-        select roundNum();
-    </select>
-    
-    <select id="selectChannelList" resultType="com.huiju.estateagents.entity.TaChannel">
-        select * from ta_channel
-        where org_id = #{orgId}
-    </select>
-
-    <select id="pageTaChannel" resultType="com.huiju.estateagents.entity.TaChannel">
-        SELECT
-        c.*,
-        count(tp.person_id) AS brokerCount,
-        (SELECT COUNT(p.recommend_agent ) from ta_person p WHERE cp.person_id = p.recommend_agent) AS inviteCount,
-        cp.person_id
-        FROM
-        ta_channel c
-        LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
-        LEFT JOIN ta_person tp ON cp.person_id = tp.person_id 	AND tp.person_type = 'estate agent' 	AND cp.STATUS = 1
-        <where>
-            <if test="channelId != null and channelId != ''">
-                c.channel_id = #{channelId}
-            </if>
-            and c.org_id = #{orgId}
-        </where>
-        GROUP BY c.channel_id
-    </select>
-
-    <select id="recommendCount" resultType="com.huiju.estateagents.entity.TaChannel">
-        SELECT
-            c.channel_id,
-            COUNT( rc.recommend_person ) AS recommendCount
-        FROM
-        ta_channel c
-        LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
-        LEFT JOIN ta_recommend_customer rc ON cp.person_id = rc.recommend_person 	AND rc.verify_status = 1 	AND rc.`status` = 1
-        <where>
-            <if test="channelId != null and channelId != ''">
-                c.channel_id = #{channelId}
-            </if>
-            and c.org_id = #{orgId}
-        </where>
-        GROUP BY c.channel_id
-    </select>
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaChannelMapper">
+
+    <select id="channelCode" resultType="int">
+        drop FUNCTION if exists roundNum;
+        create function roundNum() returns int
+        begin
+        declare x int default 1;
+        declare y int default 0;
+        declare a int default 20;
+        declare b int default 1;
+        while (b <![CDATA[ < a ]]> ) do
+        set x = (select (select FLOOR(100000 + RAND()*900000))  as num);
+        set y = (select count(1) from ta_channel where channel_code = x);
+        if y = 0
+        then return x;
+        END IF;
+        set b = b + 1;
+        end while;
+        return 0;
+        end;
+        select roundNum();
+    </select>
+    
+    <select id="selectChannelList" resultType="com.huiju.estateagents.entity.TaChannel">
+        select * from ta_channel
+        where org_id = #{orgId}
+    </select>
+
+    <select id="pageTaChannel" resultType="com.huiju.estateagents.entity.TaChannel">
+        SELECT
+        c.*,
+        count(tp.person_id) AS brokerCount,
+        (SELECT COUNT(p.recommend_agent ) from ta_person p WHERE cp.person_id = p.recommend_agent) AS inviteCount,
+        cp.person_id
+        FROM
+        ta_channel c
+        LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
+        LEFT JOIN ta_person tp ON cp.person_id = tp.person_id 	AND tp.person_type = 'estate agent' 	AND cp.STATUS = 1
+        <where>
+            <if test="channelId != null and channelId != ''">
+                c.channel_id = #{channelId}
+            </if>
+            and c.org_id = #{orgId}
+        </where>
+        GROUP BY c.channel_id
+    </select>
+
+    <select id="recommendCount" resultType="com.huiju.estateagents.entity.TaChannel">
+        SELECT
+            c.channel_id,
+            COUNT( rc.recommend_person ) AS recommendCount
+        FROM
+        ta_channel c
+        LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id and cp.`status` = 1
+        LEFT JOIN ta_person t on cp.person_id = t.person_id and t.person_type = 'estate agent'
+        LEFT JOIN ta_recommend_customer rc ON t.person_id = rc.recommend_person AND rc.verify_status = 1 AND rc.`status` = 1
+        <where>
+            <if test="channelId != null and channelId != ''">
+                c.channel_id = #{channelId}
+            </if>
+            and c.org_id = #{orgId}
+        </where>
+        GROUP BY c.channel_id
+    </select>
+
+</mapper>