From 89e1f60ac791276b6cbb39940850c9e35cd6089a Mon Sep 17 00:00:00 2001
From: zhaohengkun <zhaohengkun>
Date: Thu, 26 Sep 2024 16:37:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=20BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/LJOrderServiceImpl.java     |  8 ++++++++
 .../order/service/impl/OilOrderServiceImpl.java    | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
index 23f823864..3acc6e418 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
@@ -142,6 +142,14 @@ public class LJOrderServiceImpl extends ServiceImpl<LJOrderMapper, LJOrder> impl
 
     @Override
     public Map<String, Object> selectOrderFenxiDataByZtDz(LJOrderVo order){
+        if (ObjectUtil.isEmpty(order.getDeptId())) {
+            AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+            order.setDeptId(nowAccountInfo.getDeptId());
+        }
+
+        List<Long> strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId());
+        List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
+        order.setStoreIds(longs);
         Map<String, Object> stringObjectMap = baseMapper.selectOrderFenxiDataByZtDz(order);
         Map<String, Object> stringObjectMap2 = baseMapper.selectOrderFenxiDataByZtDz2(order);
         stringObjectMap.put("cvg",stringObjectMap2.get("cvg"));
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index edda1b647..d78528fbb 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -203,6 +203,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         }
         return oilOrderIPage;
     }
+//    查询油品分析  列表
     @Override
     public IPage<OilOrderVo> selectOilOrderFenXiListByZtDz(Page page, OilOrderVo order) {
         if (ObjectUtil.isEmpty(order.getDeptId())) {
@@ -238,9 +239,18 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         }
         return oilOrderIPage;
     }
-
+//    查询油品分析  累计
     public Map<String,String> selectOilOrderFenXiDataByZtDz(OilOrderVo order){
-        return baseMapper.selectOilOrderFenXiDataByZtDz(order);
+        if (ObjectUtil.isEmpty(order.getDeptId())) {
+            AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+            order.setDeptId(nowAccountInfo.getDeptId());
+        }
+
+        List<Long> strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId());
+        List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
+        order.setStoreIds(longs);
+        Map<String, String> stringStringMap = baseMapper.selectOilOrderFenXiDataByZtDz(order);
+        return stringStringMap;
     }
 
     public void export(HttpServletResponse response, OilOrder order) {