|
@@ -113,14 +113,22 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
} else {
|
|
} else {
|
|
|
// 查询用户是否存在
|
|
// 查询用户是否存在
|
|
|
user = Optional.ofNullable(
|
|
user = Optional.ofNullable(
|
|
|
- this.getOne(new LambdaQueryWrapper<User>().eq(User::getUnionid, unionId)))
|
|
|
|
|
- .orElseGet(() -> this.getOne(new LambdaQueryWrapper<User>().eq(User::getOpenId, openId)));
|
|
|
|
|
|
|
+ this.getOne(new LambdaQueryWrapper<User>().eq(User::getUnionid, unionId)
|
|
|
|
|
+ .orderByAsc(User::getId)
|
|
|
|
|
+ .last("limit 1")))
|
|
|
|
|
+ .orElseGet(() -> this.getOne(new LambdaQueryWrapper<User>().eq(User::getOpenId, openId)
|
|
|
|
|
+ .orderByAsc(User::getId)
|
|
|
|
|
+ .last("limit 1")));
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
// 查询用户是否存在
|
|
// 查询用户是否存在
|
|
|
user = Optional.ofNullable(
|
|
user = Optional.ofNullable(
|
|
|
- this.getOne(new LambdaQueryWrapper<User>().eq(User::getUnionid, unionId)))
|
|
|
|
|
- .orElseGet(() -> this.getOne(new LambdaQueryWrapper<User>().eq(User::getOpenId, openId)));
|
|
|
|
|
|
|
+ this.getOne(new LambdaQueryWrapper<User>().eq(User::getUnionid, unionId)
|
|
|
|
|
+ .orderByAsc(User::getId)
|
|
|
|
|
+ .last("limit 1")))
|
|
|
|
|
+ .orElseGet(() -> this.getOne(new LambdaQueryWrapper<User>().eq(User::getOpenId, openId)
|
|
|
|
|
+ .orderByAsc(User::getId)
|
|
|
|
|
+ .last("limit 1")));
|
|
|
}
|
|
}
|
|
|
return user;
|
|
return user;
|
|
|
}
|
|
}
|