Merge branch 'feature-migration-20230628'

src/main/java/cn/quantgroup/xyqb/controller/api/v2/UserApiV2Controller.java

@@ -14,7 +14,9 @@ import cn.quantgroup.xyqb.model.session.SessionStruct;
 import cn.quantgroup.xyqb.repository.IUserRepository;
 import cn.quantgroup.xyqb.service.wechat.IWechatService;
 import cn.quantgroup.xyqb.session.XyqbSessionContextHolder;
+import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 import java.util.stream.Collectors;
 
+@Slf4j
 @RestController
 @RequestMapping("/api/v2/user")
 public class UserApiV2Controller implements IBaseController {
@@ -181,7 +184,13 @@ public class UserApiV2Controller implements IBaseController {
             throw new BizException(BizExceptionEnum.UN_EXIT_USER);
         }
 
-        return JsonResult.buildSuccessResultGeneric(UserBean.from(userList, wechatUserInfo));
+        try {
+            List<UserBean> from = UserBean.from(userList, wechatUserInfo);
+            return JsonResult.buildSuccessResultGeneric(from);
+        } catch (Exception e) {
+            log.error("获取批量信息异常：{}",e.getMessage(),e);
+        }
+        return JsonResult.buildErrorStateResult("获取用户信息执行出错",null );
     }
 
 }

src/main/java/cn/quantgroup/xyqb/model/UserBean.java

@@ -74,7 +74,7 @@ public class UserBean {
                 userBean.setTenantId(user.getTenantId());
                 userBean.setCreatedAt(user.getCreatedAt());
                 if (CollectionUtils.isNotEmpty(wechatUserInfoList)) {
-                    Optional<WechatUserInfo> optionalWechatUserInfo = wechatUserInfoList.stream().filter(i -> i.getUserId().equals(user.getId())).findFirst();
+                    Optional<WechatUserInfo> optionalWechatUserInfo = wechatUserInfoList.stream().filter(i -> i.getUserId() != null && i.getUserId().equals(user.getId())).findFirst();
 
                     if (optionalWechatUserInfo.isPresent()) {
                         WechatUserInfo wechatUserInfo = optionalWechatUserInfo.get();