From 225f53573fc2383fe8eb8cabb48692061f3cb8cd Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 27 十二月 2025 18:26:33 +0800
Subject: [PATCH] 调整工单内容
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java | 24 +++++++++++++++++++++---
1 files changed, 21 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..b5345af 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,10 +4,13 @@
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;
import java.util.List;
+import java.util.Map;
/**
* @Description 搴撳尯淇℃伅
@@ -23,14 +26,29 @@
/**
* 鏌ヨ璁惧,灏嗘搷浣滀俊鎭皟鏁翠负绌猴紝榛樿鍖呮嫭鍒嗗簱鍙傛暟
*
+ * deptPR#getAllData
+ *
+ * @return
+ */
+ @DataProvider
+ public List<Dept> getAllData() {
+
+ return coreDeptService.listDept(null,ContextUtil.getCompanyId(),null);
+ }
+
+ /**
+ * 鏌ヨ璁惧,灏嗘搷浣滀俊鎭皟鏁翠负绌猴紝榛樿鍖呮嫭鍒嗗簱鍙傛暟
+ *
* deptPR#getData
*
* @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