From af8af24790cb7240da60c6752d47254d62533ffb Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 26 三月 2026 17:11:55 +0800
Subject: [PATCH] 出入库明细，导入导出，根据登录用户类型，以及搜索条件，做回显调整

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml  |    4 ++--
 fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java   |   10 ++++++++--
 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml |    4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
index a627b23..b50da89 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
@@ -185,7 +185,7 @@
         <Property></Property>
         <Property name="label">瑁呭嵏浠撳簱</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getDepotByUserType&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -325,7 +325,7 @@
         <Property></Property>
         <Property name="label">瑁呭嵏浠撳簱</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getDepotByUserType&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">name</Property>
         </Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
index 0aae604..43c8ff6 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
@@ -185,7 +185,7 @@
         <Property></Property>
         <Property name="label">瑁呭嵏浠撳簱</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getDepotByUserType&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -325,7 +325,7 @@
         <Property></Property>
         <Property name="label">瑁呭嵏浠撳簱</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getDepotByUserType&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">name</Property>
         </Property>
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
index dcf006b..6258190 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
@@ -114,10 +114,16 @@
         List<InoutRecord> list = new ArrayList<>();
         //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
         String deptName = "";
-        SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
+        String deptId= ContextUtil.subDeptId(null);
+        if (StringUtils.isNotBlank(param.getDeptId())){
+            deptId=param.getDeptId();
+        }
+        SysDept subDept = sysDeptService.getCacheDept(null,deptId);
         if (null != subDept) {
             deptName = subDept.getDeptName();
         }
+
+
         String exportTimeDesc = "";
         String exportCreateUser = "";
         Date exportCreateTime = new Date();
@@ -142,7 +148,7 @@
                 .stream()
                 .collect(Collectors.toMap(Dept::getId, Dept::getKqmc, (key1, key2) -> key2));
         // 鍒涘缓浠撳簱ID鍒板悕绉扮殑鏄犲皠
-        Map<String, String> depotMap = Optional.ofNullable(depotPR.getData(null))
+        Map<String, String> depotMap = Optional.ofNullable(depotPR.getData(ContextUtil.getCompanyId()))
                 .orElse(new ArrayList<>())
                 .stream()
                 .collect(Collectors.toMap(Depot::getId, Depot::getName, (key1, key2) -> key2));

--
Gitblit v1.9.3