From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..7a38d744 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,12 +46,13 @@
@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);
@@ -68,7 +69,7 @@
public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
@CurrentUser SysUser sysUser)
{
- List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<String> ids= PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
int num=iElseAccessoryService.countNum(Name,ids);
return getDataTable(list,num);
--
Gitblit v1.7.1