From 6468277ab2e3b6489b4b01ce995ac1c7149388c2 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 29 五月 2023 11:31:10 +0800
Subject: [PATCH] feign位置改动

---
 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
index 7d66724..b4686b9 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
@@ -93,7 +93,18 @@
 	@GetMapping("/info")
 	public R<UserVO> info(BladeUser user) {
 		User detail = userService.getById(user.getUserId());
-		return R.data(UserWrapper.build().entityVO(detail));
+		UserVO userVO = null;
+		if(detail != null){
+			userVO = UserWrapper.build().entityVO(detail);
+		}else {
+			userVO = new UserVO();
+			userVO.setId(user.getUserId());
+			userVO.setTenantId(user.getTenantId());
+			userVO.setAccount(user.getAccount());
+			userVO.setName(user.getUserName());
+			userVO.setRealName(user.getUserName());
+		}
+		return R.data(userVO);
 	}
 
 	/**

--
Gitblit v1.10.0