2 Commits f545acaf1c ... ca403da009

Author SHA1 Message Date
  liujc ca403da009 fix 2 days ago
  liujc ff90815741 fix 2 days ago

+ 10 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImUserFriendServiceImpl.java

@@ -608,6 +608,16 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
         List<ImUserWrapper.ImUserFriend> userFriends = JSON.parseArray(JSON.toJSONString(records),
                 ImUserWrapper.ImUserFriend.class);
 
+        // 获取好友ID,查询注销的人,过滤
+        if (CollectionUtils.isNotEmpty(userFriends)) {
+            List<Long> userIds = userFriends.stream().map(ImUserWrapper.ImUserFriend::getFriendId).collect(Collectors.toList());
+            List<com.yonge.cooleshow.biz.dal.entity.SysUser> sysUsers = sysUserMapper.selectBatchIds(userIds);
+            List<Long> delUserIds = sysUsers.stream().filter(o -> o.getDelFlag() == 1).map(o -> o.getId()).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(delUserIds)) {
+                userFriends = userFriends.stream().filter(o -> !delUserIds.contains(o.getFriendId())).collect(Collectors.toList());
+            }
+        }
+
         for (ImUserWrapper.ImUserFriend item : userFriends) {
             if (item.getFriendType() == null) {
                 continue;

+ 3 - 3
cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentStarMapper.xml

@@ -21,7 +21,7 @@
 		from student_star t
 		left join sys_user us on t.teacher_id_ = us.id_
 		left join sys_user ut on t.student_id_ = ut.id_
-		where us.del_flag_ = 0 and ut.del_flag_ = 0
+<!--		where us.del_flag_ = 0 and ut.del_flag_ = 0-->
 		group by t.teacher_id_
 	</select>
 
@@ -32,7 +32,7 @@
 		from student_star t
 		left join sys_user us on t.teacher_id_ = us.id_
 		left join sys_user ut on t.student_id_ = ut.id_
-		where us.del_flag_ = 0 and ut.del_flag_ = 0
+<!--		where us.del_flag_ = 0 and ut.del_flag_ = 0-->
 		group by t.student_id_
 	</select>
 
@@ -42,7 +42,7 @@
 		from student_star t
 		left join sys_user us on t.teacher_id_ = us.id_
 		left join sys_user ut on t.student_id_ = ut.id_
-		where us.del_flag_ = 0 and ut.del_flag_ = 0
+<!--		where us.del_flag_ = 0 and ut.del_flag_ = 0-->
 		and t.student_id_ = #{studentId} and t.teacher_id_ = #{teacherId}
 	</select>