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

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -16,12 +16,7 @@ import com.huiju.estateagents.center.taUser.service.*;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
-import com.huiju.estateagents.entity.SysButtonInMenu;
-import com.huiju.estateagents.entity.SysMenu;
-import com.huiju.estateagents.entity.TaMiniapp;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
-import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.service.ITaMiniappService;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
@@ -340,9 +335,9 @@ public class TaUserController extends BaseController {
         if (taUser == null) {
             return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-    
+
         if (!taUser.getStatus().equals(CommConstant.STATUS_NORMAL) ) {
-            return ResponseBean.error("当前后台服务已到期，请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("该账号已经停用，请联系管理员", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -179,8 +179,11 @@ FROM
         <if test="orgId != null">
             and p.org_id = #{orgId}
         </if>
-        LEFT JOIN ta_person c on p.share_person_id = c.person_id
+        --         LEFT JOIN ta_person c on p.share_person_id = c.person_id
+        --         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
+        LEFT JOIN ta_person p2 ON a.person_id = p2.person_id
+        LEFT JOIN ta_person c ON p2.recommend_person = c.person_id
         LEFT JOIN ta_building t2 ON a.building_id = t2.building_id
         <where>
             a.status > 0
@@ -257,7 +260,8 @@ FROM
         FROM
         ta_recommend_customer t
         LEFT JOIN ta_building t2 ON t.building_id = t2.building_id
-        LEFT JOIN ta_person t3 ON t.recommend_person = t3.person_id
+        LEFT JOIN ta_person t6 ON t.person_id = t6.person_id
+        LEFT JOIN ta_person t3 ON t6.recommend_person = t3.person_id
         LEFT JOIN ta_person_from_record t4 ON t.person_id = t4.person_id AND t4.is_first_time = 1 AND t4.org_id = #{orgId}
         LEFT JOIN td_wx_dict t5 ON t4.scene_id = t5.scene_id
         <where>
@@ -585,7 +589,8 @@ FROM
         FROM
         ta_recommend_customer t
         LEFT JOIN ta_building t2 ON t.building_id = t2.building_id
-        LEFT JOIN ta_person t3 ON t.recommend_person = t3.person_id
+        LEFT JOIN ta_person t7 ON t.person_id = t7.person_id
+        LEFT JOIN ta_person t3 ON t7.recommend_person = t3.person_id
         LEFT JOIN ta_person_from_record t4 ON t.person_id = t4.person_id AND t4.is_first_time = 1 AND t4.org_id =
         #{orgId}
         LEFT JOIN td_wx_dict t5 ON t4.scene_id = t5.scene_id
@@ -707,9 +712,13 @@ FROM
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
         LEFT JOIN ta_user d on d.user_id = a.realty_consultant
         LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1 and p.org_id = #{orgId}
-        LEFT JOIN ta_person c ON p.share_person_id = c.person_id
-        left join ta_building t on a.building_id = t.building_id
         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
+        LEFT JOIN ta_person p2 ON a.person_id = p2.person_id
+        LEFT JOIN ta_person c ON p2.recommend_person = c.person_id
+        left join ta_building t on a.building_id = t.building_id
+        --         LEFT JOIN ta_person c ON p.share_person_id = c.person_id
+        --         left join ta_building t on a.building_id = t.building_id
+        --         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
         left JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY
         person_id) s on a.person_id = s.person_id
         left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id =

src/main/resources/mapper/TaUserMapper.xml

@@ -64,7 +64,7 @@
             t.*,
             b.building_id,
             d.person_id as consultant_person_id,
-            if(d.person_id,1,0) as mini_status
+            if(d.person_id is not null,1,0) as mini_status
         FROM
             ta_user t
             LEFT JOIN ta_person_building b ON t.user_id = b.user_id