From 452cf744b08f2148729427fec50b07a4cf0cad31 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 23 三月 2026 15:18:15 +0800
Subject: [PATCH] 在线用户菜单页排序修复
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
index 2e0b8b3..7a1d369 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
@@ -5,9 +5,7 @@
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.utils.ContextUtil;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -24,6 +22,31 @@
@Resource
private CoreDeptService coreDeptService;
+ /**
+ *
+ * ${dorado.getDataProvider("deptPR#getDeptByUserType").getResult()}
+ * 鏍规嵁鐢ㄦ埛绫诲瀷鑾峰彇瀵瑰簲搴撳尯鍒楄〃淇℃伅
+ * deptPR#getDeptByUserType
+ *
+ * @return
+ */
+ @DataProvider
+ public List<Dept> getDeptByUserType(String parentId) {
+ return coreDeptService.getDeptByUserType(parentId);
+ }
+
+ /**
+ * 鏌ヨ璁惧,灏嗘搷浣滀俊鎭皟鏁翠负绌猴紝榛樿鍖呮嫭鍒嗗簱鍙傛暟
+ *
+ * deptPR#getAllData
+ *
+ * @return
+ */
+ @DataProvider
+ public List<Dept> getAllData() {
+
+ return coreDeptService.listDept(null,ContextUtil.getCompanyId(),null);
+ }
/**
* 鏌ヨ璁惧,灏嗘搷浣滀俊鎭皟鏁翠负绌猴紝榛樿鍖呮嫭鍒嗗簱鍙傛暟
@@ -33,8 +56,10 @@
* @return
*/
@DataProvider
- public List<Dept> getData() {
-
+ public List<Dept> getData(String parentId) {
+ if(StringUtils.isNotEmpty(parentId)){
+ return coreDeptService.listDept(null,null,parentId);
+ }
return coreDeptService.getDeptData();
}
--
Gitblit v1.9.3