From ca56e2f284db90ce6b8466e0e93b5bd30912320c Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 14 Jul 2020 19:02:24 +0800
Subject: [PATCH] 1.运营后台统一增加token过期自动跳转登录页 2.H端和运营平台同账户可根据权限自由登录.
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 c3007e3..2a05a44 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
@@ -115,6 +115,7 @@
sysUserLogs.setLoginAgentSystem(request.getHeader(CommonConstant.USER_AGENT_SYSTEM));
sysUserLogs.setLoginAgentBrowser(request.getHeader(CommonConstant.USER_AGENT_BROWSER));
sysUserLogs.setLoginIp(request.getHeader(CommonConstant.USER_AGENT_IP));
+ sysUserLogs.setLoginSystemScreen(request.getHeader(CommonConstant.USER_AGENT_SYSTEM_SCREEN));
sysUserLogs.setLoginTime(new Date());
sysUserLogs.setUserid(sysUser.getId());
sysUserLogs.setUsername(sysUser.getUsername());
@@ -211,9 +212,9 @@
*/
@ApiOperation(value = "用户查询列表")
@GetMapping("/users/HDoctorusers")
- public ResultBody hospitalDoctorList(@RequestParam Long hospitalId, Long departmentId) {
+ public ResultBody hospitalDoctorList(@RequestParam Long hospitalId, Long departmentId,boolean isIncluddel) {
if (StringUtils.isNotBlank(hospitalId.toString()) && StringUtils.isNotBlank(departmentId.toString())) {
- return appUserService.hospitalDoctorList(hospitalId, departmentId);
+ return appUserService.hospitalDoctorList(hospitalId, departmentId,isIncluddel);
} else {
return ResultBody.failed("查询参数有误");
}
--
Gitblit v1.8.0