From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index cd6f1c3..a449c74 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -197,7 +197,7 @@
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null,"1");
- int num=IUserService.selectNum("3",keyword,null);
+ int num=IUserService.selectNum("3",keyword,null,"1");
return getDataTable(list,num);
}
@@ -396,7 +396,7 @@
*
* @return 结果
*/
- @ApiOperation("获取登录人员信息")
+ @ApiOperation(value = "获取登录人员信息,userType=1 为超级管理员 isDivisionHead=1 为部门领导",response = SysUser.class)
@PostMapping("/getLoginInformation")
@Authorization
public ResultData getLoginInformation(@CurrentUser SysUser sysUse)
--
Gitblit v1.7.1