From d526d571cbe0a950e777fb325978d72f3ddb302b Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 13 Aug 2020 21:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index 68c1462..75f2a9a 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -199,8 +199,6 @@
})
@GetMapping("/users")
public PageResult<SysUser> findUsers(@RequestParam Map<String, Object> params) {
-// log.info("租户ID："+ TenantContextHolder.getTenant());
-// log.info("IP:"+request.getHeader(CommonConstant.USER_AGENT_IP));
return appUserService.findUsers(params);
}
/**
@@ -423,7 +421,7 @@
* 根据map查询
*/
private boolean checkAdmin(long id) {
- return id == 1L;
+ return id == CommonConstant.ADMIN_USER_ID;
}
@PostMapping("/users/findAll")
--
Gitblit v1.8.0