From 24c891b4b6b5bd0a537c3fee184d67b66135ffc8 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 07 二月 2023 19:47:43 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/sys/UserController.java | 47 ++++++-----------------------------------------
1 files changed, 6 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/UserController.java b/src/main/java/com/lf/server/controller/sys/UserController.java
index fadba3a..f995541 100644
--- a/src/main/java/com/lf/server/controller/sys/UserController.java
+++ b/src/main/java/com/lf/server/controller/sys/UserController.java
@@ -35,61 +35,26 @@
TokenService tokenService;
@SysLog()
- @ApiOperation(value = "鏌ヨ璁板綍鏁�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "uname", value = "鐢ㄦ埛鍚�", dataType = "String", paramType = "query", required = false, example = "瀹�")
- })
- @GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(String uname) {
- try {
- int count = userService.selectCount(uname);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex.getMessage(), -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "uname", value = "鐢ㄦ埗鍚�", dataType = "String", paramType = "query", example = "瀹�"),
- @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
- @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
- })
- @GetMapping(value = "/selectByPage")
- public ResponseMsg<List<UserEntity>> selectByPage(String uname, Integer pageSize, Integer pageIndex) {
- try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
-
- List<UserEntity> rs = userService.selectByPage(uname, pageSize, pageSize * (pageIndex - 1));
-
- return success(rs);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
@ApiImplicitParam(name = "uname", value = "鐢ㄦ埛鍚�", dataType = "String", paramType = "query", example = "瀹�"),
+ @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<UserEntity>> selectByPageAndCount(String uname, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<UserEntity>> selectByPageAndCount(String uname, Integer depid, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = userService.selectCount(uname);
+
+ int count = userService.selectCount(uname, depid);
if (count == 0) {
return success(0, null);
}
- List<UserEntity> rs = userService.selectByPage(uname, pageSize, pageSize * (pageIndex - 1));
+
+ List<UserEntity> rs = userService.selectByPage(uname, depid, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
--
Gitblit v1.9.3