From 426cd61c707f13a471b56330b3ba7b588b6cb245 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 15 六月 2023 18:11:58 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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..4fe20fa 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
@@ -31,6 +31,7 @@
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import com.vci.ubcs.common.cache.CacheNames;
+import org.hibernate.validator.internal.util.logging.Log;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
@@ -68,6 +69,7 @@
@RestController
@RequestMapping
@AllArgsConstructor
+@lombok.extern.java.Log
public class UserController {
private final IUserService userService;
@@ -93,7 +95,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);
}
/**
@@ -337,7 +350,7 @@
@ApiOperationSupport(order = 20)
@ApiOperation(value = "鏌ヨ鐢ㄦ埛瀵嗙爜绛栫暐鏄惁闇�瑕佹彁閱�", notes = "浼犲叆id")
public R<Long> checkRenAndExpr(BladeUser user) {
- System.out.println("==============================="+user.getUserId());
+ log.info("==============================="+user.getUserId());
Long res = userService.checkRenAndExpr(user.getUserId());
return R.data(res);
}
--
Gitblit v1.9.3