From fc94e48c0631e7468fa7a76a571f4edecef959bd Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 07 一月 2026 19:19:02 +0800
Subject: [PATCH] 粮情报表调整优化

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java
index 59495d5..306e62a 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java
@@ -2,11 +2,14 @@
 
 import com.bstek.dorado.annotation.DataProvider;
 import com.bstek.dorado.data.provider.Page;
+import com.fzzy.igds.constant.Constant;
 import com.fzzy.igds.constant.DepotType;
 import com.fzzy.igds.constant.FoodVariety;
 import com.fzzy.igds.data.GrainDataReport;
 import com.fzzy.igds.domain.DepotConf;
+import com.fzzy.igds.domain.Dept;
 import com.fzzy.igds.domain.Grain;
+import com.fzzy.igds.service.CoreDeptService;
 import com.fzzy.igds.service.DepotConfService;
 import com.fzzy.igds.service.GrainService;
 import com.fzzy.igds.service.SysDeptService;
@@ -31,6 +34,8 @@
     @Resource
     private GrainService grainService;
     @Resource
+    private CoreDeptService deptService;
+    @Resource
     private SysDeptService sysDeptService;
     @Resource
     private DepotConfService depotConfService;
@@ -47,7 +52,10 @@
         result.put("title", "绮儏姹囨�昏〃");
         if (null != subDept) {
             result.put("title", subDept.getDeptName() + "绮儏姹囨�昏〃");
-            result.put("deptId", subDept.getDeptId());
+
+            if(Constant.DEPT_TYPE_20.equals(subDept.getType())){
+                result.put("deptId", subDept.getDeptId());
+            }
         }
 
         result.put("timeDesc", "妫�娴嬫椂闂�");

--
Gitblit v1.9.3