Merge remote-tracking branch 'origin/main' into main

users/src/main/java/com/huoran/users/service/impl/HrUserAccountServiceImpl.java

@@ -411,12 +411,15 @@ public class HrUserAccountServiceImpl extends ServiceImpl<HrUserAccountMapper, H
 
         //查询个人端用户信息
         Integer userId = null;
+        String phone = null;
         for (HrUserAccount hrUserAccount : userAccountList) {
             if (hrUserAccount.getPlatformId().equals("7")){
                 userId = hrUserAccount.getUserId();
+                phone = hrUserAccount.getPhone();
             }
         }
         HrUserInfo hrUserInfo = hrUserInfoMapper.selectByUserId(userId);
+        hrUserInfo.setPhone(phone);
         hrUserInfo.setAuthentication("未认证");
 
         UserAuthenticationInformation authenticationInformation = userAuthenticationInformationMapper.selectOne(
@@ -440,18 +443,12 @@ public class HrUserAccountServiceImpl extends ServiceImpl<HrUserAccountMapper, H
 
     @Override
     public R updateAvatars(String openId, String url, String userName) {
-        //查询账号详情List
+        //查询账号详情
-        List<HrUserAccount> userAccountList = hrUserAccountMapper.selectList(new QueryWrapper<HrUserAccount>()
+        HrUserAccount hrUserAccount = hrUserAccountMapper.selectOne(new QueryWrapper<HrUserAccount>()
-                .eq("app_open_id", openId));
+                .eq("app_open_id", openId).eq("platform_id", 7));
-        //查询个人端用户信息
+
-        Integer userId = null;
-        for (HrUserAccount hrUserAccount : userAccountList) {
-            if (hrUserAccount.getPlatformId().equals("7")){
-                userId = hrUserAccount.getUserId();
-            }
-        }
         //查询用户信息
-        HrUserInfo hrUserInfo = hrUserInfoMapper.selectByUserId(userId);
+        HrUserInfo hrUserInfo = hrUserInfoMapper.selectByUserId(hrUserAccount.getUserId());
         if (StringUtils.isNotBlank(url)){
             hrUserInfo.setUserAvatars(url);
         }