|
|
|
@ -18,6 +18,7 @@ package org.springblade.system.feign;
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import org.springblade.core.mp.support.Condition; |
|
|
|
|
import org.springblade.core.tenant.annotation.NonDS; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
@ -26,6 +27,8 @@ import org.springblade.system.entity.UserInfo;
|
|
|
|
|
import org.springblade.system.entity.UserOauth; |
|
|
|
|
import org.springblade.system.enums.UserEnum; |
|
|
|
|
import org.springblade.system.service.IUserService; |
|
|
|
|
import org.springblade.system.vo.UserVO; |
|
|
|
|
import org.springblade.system.wrapper.UserWrapper; |
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping; |
|
|
|
|
import org.springframework.web.bind.annotation.PostMapping; |
|
|
|
|
import org.springframework.web.bind.annotation.RequestBody; |
|
|
|
@ -51,6 +54,15 @@ public class UserClient implements IUserClient {
|
|
|
|
|
return R.data(service.getById(userId)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
@GetMapping(USER_INFO_BY_ID_OWN) |
|
|
|
|
public R<UserVO> userInfoByIdOwn(Long userId) { |
|
|
|
|
User user = new User(); |
|
|
|
|
user.setId(userId); |
|
|
|
|
User detail = service.getOne(Condition.getQueryWrapper(user)); |
|
|
|
|
return R.data(UserWrapper.build().entityVO(detail)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
@GetMapping(USER_INFO_BY_ACCOUNT) |
|
|
|
|
public R<User> userByAccount(String tenantId, String account) { |
|
|
|
|