From 946b2dee43d8149ad24f7be0df61e61b2ec8d3b1 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 23 十一月 2022 14:54:10 +0800
Subject: [PATCH] 1.修改Bug
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 bfaed3c..6046d45 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,11 +58,15 @@
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
List<SysUser> list ;
- if (isDivisionHead!=null&&!isDivisionHead.equals(""))
+ int num;
+ if (isDivisionHead!=null&&!isDivisionHead.equals("")){
list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,isDivisionHead);
- else
+ num=IUserService.selectNum("2",keyword,ids,isDivisionHead);
+ }
+ else{
list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);
- int num=IUserService.selectNum("2",keyword,ids,null);
+ num=IUserService.selectNum("2",keyword,ids,null);
+ }
return getDataTable(list,num);
}
--
Gitblit v1.7.1