From 29952e1e673e87d4ac1fc8f7c2d6088c975fa99f Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 28 十一月 2022 11:00:39 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
index db89d01..56f613d 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
@@ -46,13 +46,14 @@
@CurrentUser SysUser sysUser)
{
Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<String> ids= PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
List<ElseAccessoryEntity> list;
- if (sysUser.getUserType().equals("2")){
- list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());}
- else {
+ if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,null);
}
+ else {
+ list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());
+ }
int num=iElseAccessoryService.countNum(name,ids);
return getDataTable(list,num);
}
--
Gitblit v1.7.1