From 7d98f48d82a5b2d0b4c42ea412fa160e41e3be9c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 10:54:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index 75ea071..fb1b341 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -58,7 +58,7 @@
List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);
- int num=IUserService.selectNum("2",keyword,ids);
+ int num=IUserService.selectNum("2",keyword,ids,null);
return getDataTable(list,num);
}
--
Gitblit v1.7.1