bug fix

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -234,18 +234,20 @@ public class SysUserChannelController extends BaseController {
         }
 
         //更新业务层的登录账号为禁用
-        QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
-        taChannelAppRelationQueryWrapper.eq("channel_id", id);
-        List<TaChannelAppRelation> taChannelAppRelation = iTaChannelAppRelationService.list(taChannelAppRelationQueryWrapper);
-        List<Integer> orgIdList = new ArrayList<>();
-        taChannelAppRelation.forEach(e->{
-            orgIdList.add(e.getOrgId());
-        });
-        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
-        taUserQueryWrapper.in("org_id", orgIdList);
-        TaUser taUser = new TaUser();
-        taUser.setStatus(taChannelProxy.getStatus());
-        iTaUserService.update(taUser, taUserQueryWrapper);
+        if (taChannelProxy.getStatus() != null){
+            QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
+            taChannelAppRelationQueryWrapper.eq("channel_id", id);
+            List<TaChannelAppRelation> taChannelAppRelation = iTaChannelAppRelationService.list(taChannelAppRelationQueryWrapper);
+            List<Integer> orgIdList = new ArrayList<>();
+            taChannelAppRelation.forEach(e->{
+                orgIdList.add(e.getOrgId());
+            });
+            QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+            taUserQueryWrapper.in("org_id", orgIdList);
+            TaUser taUser = new TaUser();
+            taUser.setStatus(taChannelProxy.getStatus());
+            iTaUserService.update(taUser, taUserQueryWrapper);
+        }
 
         QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
         taChannelProxyQueryWrapper.eq("channel_id", id);

src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java

@@ -223,7 +223,7 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 		taPersonQueryWrapper.eq("org_id",orgId);
 		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
 		//获取我的访问客户列表
-		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxActivityVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), eventType);
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxActivityVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(eventType) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(eventType) ? "dynamic" : eventType)  + "_share");
 		List<TaPersonVisitRecord> records = result.getRecords();
 		//判断是否我的客户状态
 		records.forEach(e -> {

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -128,12 +128,12 @@
 	        p.`nickname` as nickname,
 	        p.avatarurl
         FROM
-            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and target_id = #{targetId} AND consultant_id = #{userId} and person_id != #{personId} and event_type = #{eventType} ORDER BY visit_time DESC LIMIT 999) t
+            ( SELECT * FROM ta_share_person_from WHERE org_id = #{orgId} and target_id = #{targetId} AND share_person = #{userId} and target_type = #{eventType} ORDER BY create_date DESC LIMIT 999) t
             left JOIN ta_person p on t.person_id = p.person_id
         GROUP BY
             t.person_id
         ORDER BY
-	        t.visit_time DESC
+	        t.create_date DESC
     </select>