From 5790d7573a83278667878e0f73104f8fc8ec5cf3 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 10 三月 2026 11:03:51 +0800
Subject: [PATCH] 巡检统计信息纠正
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 ecac0dd..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;
@@ -25,6 +23,19 @@
private CoreDeptService coreDeptService;
/**
+ *
+ * ${dorado.getDataProvider("deptPR#getDeptByUserType").getResult()}
+ * 鏍规嵁鐢ㄦ埛绫诲瀷鑾峰彇瀵瑰簲搴撳尯鍒楄〃淇℃伅
+ * deptPR#getDeptByUserType
+ *
+ * @return
+ */
+ @DataProvider
+ public List<Dept> getDeptByUserType(String parentId) {
+ return coreDeptService.getDeptByUserType(parentId);
+ }
+
+ /**
* 鏌ヨ璁惧,灏嗘搷浣滀俊鎭皟鏁翠负绌猴紝榛樿鍖呮嫭鍒嗗簱鍙傛暟
*
* deptPR#getAllData
@@ -34,7 +45,7 @@
@DataProvider
public List<Dept> getAllData() {
- return coreDeptService.getAllDeptData();
+ return coreDeptService.listDept(null,ContextUtil.getCompanyId(),null);
}
/**
@@ -45,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