From 473dee8739de376e54bef5bbfbdd0f45eca38e9a Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 16 十一月 2022 10:57:33 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
---
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 764bbb4..caa39f5 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,"3",keyword,null,"1");
- int num=IUserService.selectNum("3",keyword,null);
+ int num=IUserService.selectNum("3",keyword,null,"1");
return getDataTable(list,num);
}
--
Gitblit v1.7.1