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

src/main/java/com/huiju/estateagents/entity/TaOrg.java

@@ -1,6 +1,8 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -55,6 +57,7 @@ public class TaOrg implements Serializable {
      */
     private LocalDateTime createDate;
 
+    @TableField(strategy= FieldStrategy.IGNORED)
     private String waterMark;
 
     /**

src/main/resources/mapper/TaPersonBuildingMapper.xml

@@ -8,7 +8,7 @@
         left join ta_person b on t.user_id = b.user_id
         left join ta_share_count c on b.person_id = c.person_id
         LEFT JOIN ta_building d on a.building_id = d.building_id
-        where t.org_id = #{orgId}
+        where t.org_id = #{orgId} and t.is_consultant = 1
             <if test="buildingId != null and buildingId != ''">
               and a.building_id = #{buildingId}
             </if>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -613,11 +613,11 @@ FROM
         if(a.sex = 1, '男', if(a.sex = 2, '女', '未知')) as sex,
         CASE
         WHEN b.NAME IS NULL THEN
-        c.NAME ELSE b.NAME
+        d.user_name ELSE b.NAME
         END AS consultantName,
         CASE
         WHEN b.tel IS NULL THEN
-        c.tel ELSE b.tel
+        d.phone ELSE b.tel
         END AS consultTel,
         t.building_name
         FROM

src/main/resources/mapper/TaShareCountMapper.xml

@@ -31,7 +31,7 @@
         from ta_share_count t
         left join ta_building_dynamic a on t.be_share = a.dynamic_id and t.tagert_type = 'activity'
         left join ta_help_activity b on t.be_share = b.help_activity_id and t.tagert_type = 'help'
-        left join ta_share_activity c on t.be_share = c.share_id and t.tagert_type = 'group'
+        left join ta_share_activity c on t.be_share = c.group_activity_id and t.tagert_type = 'group'
         LEFT JOIN ta_drainage d on t.be_share = d.drainage_id and t.tagert_type = 'h5'
         left join ta_building e on t.be_share = e.building_id and t.tagert_type = 'project'
         LEFT JOIN ta_news f on t.be_share = f.news_id and t.tagert_type = 'news'
@@ -67,8 +67,8 @@
                 when a.`name` != null || a.`name` != '' then a.`name`
                 else '空'
                 end as shareTitle,
-                        a.phone as personPhone,
-                        a.nickName as personName,
+                        z.phone as personPhone,
+                        z.nickName as personName,
                         t.create_date
 
         FROM
@@ -81,7 +81,8 @@
                 left join ta_building e on t.target_id = e.building_id and t.target_type = 'building_share'
                 LEFT JOIN ta_news f on t.target_id = f.news_id and t.target_type = 'news_share'
 
-        LEFT JOIN ta_person a ON t.person_id = a.person_id and t.target_type = 'card_share'
+        LEFT JOIN ta_person a ON t.share_person = a.person_id or t.share_person = a.user_id
+        LEFT JOIN ta_person z ON t.person_id = z.person_id
         WHERE
             (t.share_person = (select user_id from ta_person where person_id = #{personId}) or t.share_person = #{personId})
         AND t.org_id = #{orgId}