From 66e1e898f5020b5e02a99e361569637a72f8c2cf Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 29 十二月 2025 14:31:45 +0800
Subject: [PATCH] 优化公司、库区、仓库页面，通知单word导出提交
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java | 13 +++++++------
1 files changed, 7 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..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
@@ -5,13 +5,12 @@
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;
import java.util.List;
+import java.util.Map;
/**
* @Description 搴撳尯淇℃伅
@@ -34,7 +33,7 @@
@DataProvider
public List<Dept> getAllData() {
- return coreDeptService.getAllDeptData();
+ return coreDeptService.listDept(null,ContextUtil.getCompanyId(),null);
}
/**
@@ -45,8 +44,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