From b0bf1e22362371b49ab4827ef89da521b7bbb46f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 18 十一月 2022 16:18:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 764bbb4..e82afa6 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
@@ -195,9 +195,9 @@
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
- List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,null,keyword,null,"1");
- int num=IUserService.selectNum("3",keyword,null);
+ int num=IUserService.selectNum(null,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