From 78b1bdc6a0c3966aec7df8099759216eb3f1a9ae Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 23 May 2023 16:48:01 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=20v2:=201.=E6=A0=B9=E6=8D=AE=E6=8A=A5=E9=94=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=BF=94=E5=9B=9E=E6=8F=90=E7=A4=BA=E8=AF=AD=202.?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=A0=B9=E6=8D=AE=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9=E7=9A=84=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/admin/sys/controller/SysDeptController.java  |  8 +++++++-
 .../admin/sys/service/impl/SysDeptServiceImpl.java    | 11 +++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/controller/SysDeptController.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/controller/SysDeptController.java
index a0c8720a..69bba807 100644
--- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/controller/SysDeptController.java
+++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/controller/SysDeptController.java
@@ -45,7 +45,13 @@ public class SysDeptController extends AbstractController {
      * 列表
      */
     @RequestMapping("/list")
-    public ResponseEntity<?> list(@RequestBody long deptId) {
+    public ResponseEntity<?> list(@RequestBody Map<String, String> pramsMap) {
+        long deptId = 0;
+        if(StringUtils.isNotEmpty(pramsMap.get("deptId"))) {
+            deptId = Long.parseLong(pramsMap.get("deptId"));
+        }else{
+            deptId = -1;
+        }
         String company = "";
         UserInfo userInfo = getUserInfo();
         if (Long.parseLong(getUserId()) != Constant.SUPER_ADMIN && !userInfo.getCompany().contains(SysConfig.ZXQY)) {
diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java
index afe54c19..3dd677ca 100644
--- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java
+++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java
@@ -58,6 +58,17 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptDao, SysDeptEntity> i
     public List<SysDeptEntity> queryList(String company, long parentId) {
         DynamicContextHolder.push(DbConstant.BASICS_READ);
         List<SysDeptEntity> deptList = baseMapper.queryList(company);
+        if(parentId == -1){
+            parentId = 0;
+            if (StringUtils.isNotBlank(company)) {
+                for (SysDeptEntity deptEntity : deptList) {
+                    if ("1".equals(deptEntity.getDeptType())) {
+                        parentId = deptEntity.getParentId();
+                        break;
+                    }
+                }
+            }
+        }
         return this.getChildPerms(deptList, parentId);
     }