bug fix

src/main/resources/mapper/statistic/TaActivityStaticMapper.xml

@@ -1401,7 +1401,7 @@
         'live_share', 'group_share')
         and t.org_id = #{orgId} group by t.share_person ) t
         left join ta_person a on t.share_person = a.person_id
-        left join ta_person b on t.share_person = b.person_id
+        left join ta_person b on t.share_person = b.user_id
         ) as visitNum on visitNum.person_id = person.person_id
 
         left join (
@@ -1413,9 +1413,9 @@
         WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date <=
         DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
         and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
-        and t.org_id = #{orgId} ) t
+        and t.org_id = #{orgId} group by t.share_person ) t
         left join ta_person a on t.share_person = a.person_id
-        left join ta_person b on t.share_person = b.person_id
+        left join ta_person b on t.share_person = b.user_id
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
         <if test="colKey == null or colKey == ''">
             order by person.create_date desc
@@ -1546,28 +1546,33 @@
 
         ) as visitNum on visitNum.person_id = person.person_id
 
+        left join (
+        SELECT t.visitNum, ifnull(a.person_id,b.person_id) AS person_id
+        FROM (
+        SELECT t.share_person, count(1) as visitNum
+        FROM ta_share_person_from t
+        WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S') AND t.create_date &lt;=
+        DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S') AND t.target_type IN ('dynamic_share', 'h5_share', 'help_share',
+        'live_share', 'group_share')
+        and t.org_id = #{orgId} group by t.share_person ) t
+        left join ta_person a on t.share_person = a.person_id
+        left join ta_person b on t.share_person = b.user_id
+        ) as visitNum on visitNum.person_id = person.person_id
+
         left join (
 
-        SELECT count(1) as visitPersonNum, visitPersonNum.share_person as person_id
+        SELECT t.visitPersonNum, ifnull(a.person_id,b.person_id) AS person_id
         FROM (
-        select t.*, a.person_id From (
-        SELECT count(1) as visitPersonNum , t.share_person
+        SELECT count(DISTINCT t.person_id ) as visitPersonNum, t.share_person
         FROM ta_share_person_from t
         WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;=
         DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
         and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
-        and t.org_id = #{orgId} group by t.person_id
-        ) as t
-        LEFT JOIN (
-        SELECT a.person_id, b.user_id
-        FROM ta_person a
-        LEFT JOIN ta_user b
-        ON a.user_id = b.user_id
-        WHERE a.org_id = 84 ) as a
-        ON t.share_person = a.person_id or t.share_person = a.user_id
-        ) as visitPersonNum group by visitPersonNum.person_id
-
+        and t.org_id = #{orgId} group by t.share_person ) t
+        left join ta_person a on t.share_person = a.person_id
+        left join ta_person b on t.share_person = b.user_id
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
+
         <if test="colKey == null or colKey == ''">
             order by person.create_date desc
         </if>
@@ -2091,16 +2096,13 @@
         From (
         SELECT count(1) as visitNum, t.person_id, t.create_date
         FROM ta_share_person_from t
-        LEFT JOIN (
-        SELECT a.person_id, b.user_id
-        FROM ta_person a
-        LEFT JOIN ta_user b
-        ON a.user_id = b.user_id
-        WHERE a.org_id = #{orgId} ) as a ON t.share_person = a.person_id or t.share_person = a.user_id
         WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;=
         DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' ) and t.target_type in
         ('dynamic_share','h5_share','help_share','live_share', 'group_share')
-        and t.share_person = #{personId} group by t.person_id
+        and
+        (t.share_person = (select b.user_id from ta_person t left join ta_user b on t.user_id = b.user_id where t.person_id = #{personId})
+        or t.share_person = #{personId})
+        group by t.person_id
         ) as t
 
         left join ta_person a on t.person_id = a.person_id
@@ -2158,16 +2160,13 @@
         From (
         SELECT count(1) as visitNum, t.person_id, t.create_date
         FROM ta_share_person_from t
-        LEFT JOIN (
-        SELECT a.person_id, b.user_id
-        FROM ta_person a
-        LEFT JOIN ta_user b
-        ON a.user_id = b.user_id
-        WHERE a.org_id = #{orgId} ) as a ON t.share_person = a.person_id or t.share_person = a.user_id
         WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;=
         DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' ) and t.target_type in
         ('dynamic_share','h5_share','help_share','live_share', 'group_share')
-        and t.share_person = #{personId} group by t.person_id
+        and
+        (t.share_person = (select b.user_id from ta_person t left join ta_user b on t.user_id = b.user_id where t.person_id = #{personId})
+        or t.share_person = #{personId})
+        group by t.person_id
         ) as t
 
         left join ta_person a on t.person_id = a.person_id