Commit b3bf7eb3 authored by 王亮's avatar 王亮

fix an issue.(batch query)

parent 11e2e016
......@@ -43,27 +43,28 @@ public class UserBean {
public static List<UserBean> from(List<User> userList, List<WechatUserInfo> wechatUserInfoList) {
List<UserBean> result = new ArrayList<>();
userList.forEach(user -> {
UserBean userBean = new UserBean();
userBean.setUserId(user.getId());
userBean.setPhoneNo(user.getPhoneNo());
userBean.setRegisteredFrom(user.getRegisteredFrom());
userBean.setUuid(user.getUuid());
userBean.setEnable(user.getEnable());
userBean.setTenantId(user.getTenantId());
if (CollectionUtils.isNotEmpty(wechatUserInfoList)) {
Optional<WechatUserInfo> optionalWechatUserInfo = wechatUserInfoList.stream().filter(i -> i.getUserId().equals(user.getId())).findFirst();
if (CollectionUtils.isNotEmpty(userList)) {
userList.forEach(user -> {
UserBean userBean = new UserBean();
userBean.setUserId(user.getId());
userBean.setPhoneNo(user.getPhoneNo());
userBean.setRegisteredFrom(user.getRegisteredFrom());
userBean.setUuid(user.getUuid());
userBean.setEnable(user.getEnable());
userBean.setTenantId(user.getTenantId());
if (CollectionUtils.isNotEmpty(wechatUserInfoList)) {
Optional<WechatUserInfo> optionalWechatUserInfo = wechatUserInfoList.stream().filter(i -> i.getUserId().equals(user.getId())).findFirst();
if (optionalWechatUserInfo.isPresent()) {
WechatUserInfo wechatUserInfo = optionalWechatUserInfo.get();
userBean.setOpenId(wechatUserInfo.getOpenId());
userBean.setUnionId(wechatUserInfo.getUnionId());
userBean.setAppId(wechatUserInfo.getAppId());
if (optionalWechatUserInfo.isPresent()) {
WechatUserInfo wechatUserInfo = optionalWechatUserInfo.get();
userBean.setOpenId(wechatUserInfo.getOpenId());
userBean.setUnionId(wechatUserInfo.getUnionId());
userBean.setAppId(wechatUserInfo.getAppId());
}
}
}
result.add(userBean);
});
result.add(userBean);
});
}
return result;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment