From 18997e6de96f7be5b55a94168c80103e6363cb0e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 12 七月 2023 20:24:53 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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..9f249e4 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);
}
/**
@@ -127,6 +140,12 @@
public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
return R.data(UserWrapper.build().pageVO(pages));
+ }
+
+ @GetMapping("/allPage")
+ public R<List<UserVO>> allPage(User user,Long deptId) {
+ List<User> userss = userService.selectAllUser(user,deptId);
+ return R.data(UserWrapper.build().listVO(userss));
}
/**
@@ -297,7 +316,6 @@
return R.data(userService.platformDetail(user));
}
-
/**
* 鐢ㄦ埛鍒楄〃鏌ヨ
*/
@@ -337,9 +355,11 @@
@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