From 56e2dc02ca5f4cf38308f8a1389322639f89e99e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 16:01:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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..7100120 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
@@ -48,11 +48,12 @@
Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
List<String> ids= PermissionUtil.getPermission(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