From fa0414b2f44aa07c282b73195f7ea2ef3ab1eb74 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 25 十二月 2025 19:19:53 +0800
Subject: [PATCH] 首页大屏数据交互2

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
index d95b23a..7ff3a60 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
@@ -49,7 +49,7 @@
         if(StringUtils.isNotBlank(parentId)){
             queryWrapper.likeRight("id", parentId);
         }
-
+        queryWrapper.orderByAsc("id");
         return coreDeptMapper.selectList(queryWrapper);
     }
 
@@ -59,8 +59,7 @@
      */
     public List<Dept> getDeptData() {
         SysUser user = ContextUtil.getLoginUser();
-        SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
-        if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
+        if (Constant.USER_TYPE_30.equals(user.getUserType())) {
             return this.listDept(ContextUtil.subDeptId(user),null,null);
         }else {
             return this.listDept(null,null,user.getDeptId() + "%");

--
Gitblit v1.9.3