From 9c136c58963fb453c41865f658d4eef48d536d02 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 26 十二月 2025 17:56:46 +0800
Subject: [PATCH] 抓拍、ai事件查询修改;弹框调整;收储公司、库区、仓库页面交互优化

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java
index e0dc0e3..0ef8025 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java
@@ -77,15 +77,16 @@
         //澶氬弬鏁板垎椤垫煡璇�
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<InoutRecord> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(0, 10000);
         //鏀跺偍鍏徃鏌ヨ澶勭悊
-        if(StringUtils.isEmpty(param.getDeptId())){
-            param.setDeptId(param.getCompanyId());
-        }
         if(StringUtils.isNotEmpty(param.getDeptId()) && StringUtils.isNotEmpty(param.getCompanyId())){
             String substring = param.getDeptId().substring(0, (param.getDeptId().length() - 3));
             if (!substring.equals(param.getCompanyId())){
                 return new ArrayList<InoutRecord>();
             }
         }
+        if(StringUtils.isEmpty(param.getDeptId())){
+            param.setDeptId(param.getCompanyId());
+        }
+
         param.setCompanyId(null);
         inoutReportService.listPageInout(corePage, param);
         //鑾峰彇鏌ヨ鍒板緱list鏁版嵁

--
Gitblit v1.9.3