From 8dbce7c8f9569f66c34854b723d4aa1c1e092f7e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 23 十二月 2025 19:32:14 +0800
Subject: [PATCH] 系统首页数据交互提交

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java |   15 ++++++++++++---
 1 files changed, 12 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 eefcd8d..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() + "%");
@@ -68,6 +67,16 @@
     }
 
     /**
+     * 鏍规嵁ID鏌ヨ搴撳尯淇℃伅
+     * @param id
+     * @return
+     */
+    public Dept getDeptById(String id) {
+
+        return coreDeptMapper.selectById(id);
+    }
+
+    /**
      * 鏂板鎴栨洿鏂板簱鍖轰俊鎭�
      * @param sysDept
      * @param isAdd

--
Gitblit v1.9.3