From 323ee86aabb415f7d46594b228a7cddca40bea25 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 29 十二月 2025 14:33:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
index 3e6650b..4206348 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
@@ -6,6 +6,7 @@
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@@ -30,8 +31,11 @@
* @return
*/
@DataProvider
- public List<Depot> getData(){
- return depotService.getData(null, null);
+ public List<Depot> getData(String parentId){
+ if(StringUtils.isNotEmpty(parentId)){
+ return depotService.getData(null,parentId,false);
+ }
+ return depotService.getData(null, ContextUtil.subDeptId(null) ,false);
}
/**
@@ -46,7 +50,6 @@
Depot depot = new Depot();
BeanUtils.copyProperties(data, depot);
depotService.saveDepot(depot);
- depotService.flushCache(null);
return null;
}
--
Gitblit v1.9.3