Merge branch 'feature/0721-tenant'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -422,10 +422,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
 
         // 机构老师与学生互加好友关系
         if (Optional.ofNullable(teacher.getTenantId()).orElse(-1L) > 0) {
-            // 自动与机构老师成为好友
+            // 自动与机构学生成为好友
             Set<Long> collect = studentService.lambdaQuery()
                     .eq(Student::getTenantId, teacher.getTenantId()).list().stream()
-                    .map(Student::getUserId).filter(next->!next.equals(teacher.getUserId())).collect(Collectors.toSet());
+                    .map(Student::getUserId).collect(Collectors.toSet());
 
             imUserFriendService.saveUserFriend(teacher.getUserId(), collect);
         }
@@ -438,7 +438,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             queryWrapper.lambda().in(com.yonge.cooleshow.biz.dal.entity.SysUser::getPhone,phones);
             List<com.yonge.cooleshow.biz.dal.entity.SysUser> sysUsers = sysUserMapper.selectList(queryWrapper);
             Set<Long> userIds = sysUsers.stream().map(com.yonge.cooleshow.biz.dal.entity.SysUser::getId).collect(Collectors.toSet());
-            if (userIds.isEmpty()) {
+            if (!userIds.isEmpty()) {
                 imUserFriendService.saveUserTeacherFriend(teacher.getUserId(), userIds);
             }
         }
@@ -1036,10 +1036,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
 
         // 机构老师与学生互加好友关系
         if (Optional.ofNullable(updateTenant.getTenantId()).orElse(-1L) > 0) {
-            // 自动与机构老师成为好友
+            // 自动与机构学生成为好友
             Set<Long> collect = studentService.lambdaQuery()
                     .eq(Student::getTenantId, updateTenant.getTenantId()).list().stream()
-                    .map(Student::getUserId).filter(next -> !next.equals(teacher.getUserId()))
+                    .map(Student::getUserId)
                     .collect(Collectors.toSet());
 
             if (!collect.isEmpty()) {

cooleshow-user/user-biz/src/main/resources/config/mybatis/ImUserFriendMapper.xml

@@ -31,11 +31,9 @@
     <delete id="delFriendByTenantId">
         DELETE t1
         FROM im_user_friend t1
-                 LEFT JOIN teacher t2 ON (
-                    t2.tenant_id_ = #{tenantId} AND
-                    (t1.user_id_ = t2.user_id_ OR t1.friend_id_ = t2.user_id_)
-            )
-        WHERE (t1.user_id_ = #{userId} and t1.client_type_ = #{clientType})
-        OR t1.friend_id_ = #{userId}
+                 LEFT JOIN teacher t2 ON t1.friend_id_ = t2.user_id_
+                 LEFT JOIN teacher t3 ON t1.user_id_ = t3.user_id_
+        WHERE (t1.user_id_ = #{userId} and t1.client_type_ = #{clientType} and t2.tenant_id_ = #{tenantId})
+           OR (t1.friend_id_ = #{userId} and t1.friend_type_ = #{clientType} and t3.tenant_id_ = #{tenantId})
     </delete>
 </mapper>

toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/user/realname/provider/LinkfaceRealnameAuthenticationPlugin.java

@@ -3,6 +3,7 @@ package com.yonge.toolset.thirdparty.user.realname.provider;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.yonge.toolset.utils.idcard.IdcardValidator;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,6 +69,12 @@ public class LinkfaceRealnameAuthenticationPlugin implements RealnameAuthenticat
 
     @Override
     public boolean verify(String realname, String idcardNo) {
+
+        IdcardValidator idcardValidator = new IdcardValidator();
+        if (idcardValidator.isValidatedAllIdcard(idcardNo)) {
+            return true;
+        }
+
         String respJson = "";
         HashMap<String, Object> params = new HashMap<String, Object>();
         params.put("api_id", appId);