.

src/main/java/cn/quantgroup/xyqb/service/v2/LoginContext.java

@@ -119,6 +119,13 @@ public class LoginContext {
             throw new BizException(BizExceptionEnum.ERROR_PARAM);
         }
 
+
+        Optional<UserInfoConvertReq.UserConvertInfo> first = userConvertInfoList.stream().filter(e -> e.getWechatUserInfo() != null).findFirst();
+        if (first.isPresent()) {
+            WechatUserInfo wechatUserInfo = first.get().getWechatUserInfo();
+            req.setAppId(wechatUserInfo.getAppId());
+        }
+
         //phoneNo: User
         Map<String,User> phoneUserMap = Maps.newHashMap();
 
@@ -129,10 +136,22 @@ public class LoginContext {
         Map<String, WechatUserInfo> phoneWechatUserMap = Maps.newHashMap();
         List<String> phoneNoList = Lists.newArrayList();
         for (UserInfoConvertReq.UserConvertInfo convertInfo : userConvertInfoList) {
-            phoneUserMap.put(convertInfo.getUser().getPhoneNo(), convertInfo.getUser());
-            phoneUserEntityMap.put(convertInfo.getUser().getPhoneNo(), convertInfo.getUserInfoEntity());
-            phoneWechatUserMap.put(convertInfo.getUser().getPhoneNo(), convertInfo.getWechatUserInfo());
-            phoneNoList.add(convertInfo.getUser().getPhoneNo());
+            User user = convertInfo.getUser();
+            UserInfoEntity userInfoEntity = convertInfo.getUserInfoEntity();
+            WechatUserInfo wechatUserInfo = convertInfo.getWechatUserInfo();
+            if (user != null) {
+                phoneUserMap.put(user.getPhoneNo(), user);
+                phoneNoList.add(user.getPhoneNo());
+            }else {
+                log.info("清洗数据无用户数据信息：{}",JSONObject.toJSONString(convertInfo));
+                continue;
+            }
+            if (userInfoEntity != null) {
+                phoneUserEntityMap.put(user.getPhoneNo(), userInfoEntity);
+            }
+            if (wechatUserInfo != null) {
+                phoneWechatUserMap.put(user.getPhoneNo(), wechatUserInfo);
+            }
         }
 
         //用户注册
@@ -149,7 +168,10 @@ public class LoginContext {
 
         //用户微信信息
         List<String> openIdList = phoneWechatUserMap.values().stream().map(e -> e.getOpenId()).collect(Collectors.toList());
-        List<WechatUserInfo> wechatUserInfoListQuery = weChatUserRepository.findByOpenIdInAndAppIdAndTenantId(openIdList, req.getAppId(), req.getTenantId());
+        List<WechatUserInfo> wechatUserInfoListQuery = Lists.newArrayList();
+        if (CollectionUtils.isNotEmpty(openIdList)) {
+            wechatUserInfoListQuery = weChatUserRepository.findByOpenIdInAndAppIdAndTenantId(openIdList, req.getAppId(), req.getTenantId());
+        }
 
         Map<Long, WechatUserInfo> userIdWechatMapQuery = Maps.newHashMap();
         if (CollectionUtils.isNotEmpty(wechatUserInfoListQuery)) {