From 4b92c6f30a86ad0f804614b2659c1dda368b8fdd Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 05 十二月 2022 16:57:02 +0800
Subject: [PATCH] 更换短信平台

---
 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