From e1fff37bbddb3944d15c258df90bea18c5ca2967 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 16 十一月 2022 09:32:19 +0800
Subject: [PATCH] 新增获取子部门id接口

---
 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
index 6c012c3..db0058c 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -27,6 +27,7 @@
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -190,7 +191,7 @@
             WxUtil wxUtil=new WxUtil();
             String accessToken="0";
             try {
-                accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString();
+                accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -328,14 +329,22 @@
     {
         List<String> ids=null;
         String userId=null;
-        if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+        if( StringUtils.equals("2",sysUser.getRoleIds()))
         {
-            userId=null;
-            ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+            if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+            {
+                ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+            }
+            else
+            {
+                userId=sysUser.getUserId()+"";
+                ids=new ArrayList<>();
+                ids.add(sysUser.getDepartmentId());
+            }
         }
         else
         {
-            userId=sysUser.getUserId()+"";
+            ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
         }
         List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId,null,null,null);
         int num=iGuideRepairOrderService.countConfigList(null,ids,status,userId);

--
Gitblit v1.7.1