Skip to content

X
xyqb-user2
Commit b3bf7eb3 authored by 王亮's avatar 王亮
Browse files
Options

fix an issue.(batch query)

parent 11e2e016
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 19 deletions
src/main/java/cn/quantgroup/xyqb/model/UserBean.java
View file @ b3bf7eb3
...@@ -43,27 +43,28 @@ public class UserBean { ...@@ -43,27 +43,28 @@ public class UserBean {
public static List<UserBean> from(List<User> userList, List<WechatUserInfo> wechatUserInfoList) { public static List<UserBean> from(List<User> userList, List<WechatUserInfo> wechatUserInfoList) {
List<UserBean> result = new ArrayList<>(); List<UserBean> result = new ArrayList<>();
userList.forEach(user -> { if (CollectionUtils.isNotEmpty(userList)) {
UserBean userBean = new UserBean(); userList.forEach(user -> {
userBean.setUserId(user.getId()); UserBean userBean = new UserBean();
userBean.setPhoneNo(user.getPhoneNo()); userBean.setUserId(user.getId());
userBean.setRegisteredFrom(user.getRegisteredFrom()); userBean.setPhoneNo(user.getPhoneNo());
userBean.setUuid(user.getUuid()); userBean.setRegisteredFrom(user.getRegisteredFrom());
userBean.setEnable(user.getEnable()); userBean.setUuid(user.getUuid());
userBean.setTenantId(user.getTenantId()); userBean.setEnable(user.getEnable());
if (CollectionUtils.isNotEmpty(wechatUserInfoList)) { userBean.setTenantId(user.getTenantId());
Optional<WechatUserInfo> optionalWechatUserInfo = wechatUserInfoList.stream().filter(i -> i.getUserId().equals(user.getId())).findFirst(); if (CollectionUtils.isNotEmpty(wechatUserInfoList)) {
Optional<WechatUserInfo> optionalWechatUserInfo = wechatUserInfoList.stream().filter(i -> i.getUserId().equals(user.getId())).findFirst();
if (optionalWechatUserInfo.isPresent()) { if (optionalWechatUserInfo.isPresent()) {
WechatUserInfo wechatUserInfo = optionalWechatUserInfo.get(); WechatUserInfo wechatUserInfo = optionalWechatUserInfo.get();
userBean.setOpenId(wechatUserInfo.getOpenId()); userBean.setOpenId(wechatUserInfo.getOpenId());
userBean.setUnionId(wechatUserInfo.getUnionId()); userBean.setUnionId(wechatUserInfo.getUnionId());
userBean.setAppId(wechatUserInfo.getAppId()); userBean.setAppId(wechatUserInfo.getAppId());
}
} }
} result.add(userBean);
result.add(userBean); });
}); }
return result; 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