From f0287da5142c604f774096c458dab2156c0fe7c1 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期六, 17 一月 2026 17:38:09 +0800
Subject: [PATCH] 代码合并修改
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 3e16a32..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
@@ -4,6 +4,8 @@
import com.bstek.dorado.annotation.DataResolver;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.service.CoreDeptService;
+import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -21,6 +23,32 @@
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);
+ }
+
+ /**
* 鏌ヨ璁惧,灏嗘搷浣滀俊鎭皟鏁翠负绌猴紝榛樿鍖呮嫭鍒嗗簱鍙傛暟
*
* deptPR#getData
@@ -28,9 +56,11 @@
* @return
*/
@DataProvider
- public List<Dept> getData() {
-
- return coreDeptService.getAllData(null);
+ public List<Dept> getData(String parentId) {
+ if(StringUtils.isNotEmpty(parentId)){
+ return coreDeptService.listDept(null,null,parentId);
+ }
+ return coreDeptService.getDeptData();
}
/**
--
Gitblit v1.9.3