From 14a3c56a7344f8845ac94863e7f02a99679a7dff Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Thu, 23 May 2024 09:18:59 +0800
Subject: [PATCH] no message

---
 .../financialStatement/runningWater/tab/instituion.vue      | 6 +++++-
 .../order/service/impl/AllOrderInfoServiceImpl.java         | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue
index f8869c703..c61de5f42 100644
--- a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue
@@ -108,7 +108,11 @@
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="deptId" align="center" label="机构编号" width="220"> </el-table-column>
-          <el-table-column prop="deptName" align="center" label="机构名称"> </el-table-column>
+          <el-table-column prop="deptName" align="center" label="机构名称">
+          <template slot-scope="slot">
+            <span>{{slot.row.deptName}}({{slot.row.parentStoreName}})</span>
+          </template>
+          </el-table-column>
           <el-table-column prop="inertiaStore" align="center" label="活跃门店数量"> </el-table-column>
           <el-table-column prop="amount" align="center" label="交易金额"> </el-table-column>
           <el-table-column prop="strokeCount" align="center" label="交易笔数"> </el-table-column>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
index 3e63e6567..cdde12f17 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
@@ -590,8 +590,8 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
             long dayNum = 0;
             // 查询父级
             SysDept sysDept1 = sysDeptMapper.selectDeptById(sysDept.getParentId());
-            sysDept.setParentStoreId(sysDept.getParentId());
-            sysDept.setParentStoreName(sysDept1.getParentName());
+            sysDept.setParentStoreId(sysDept.getDeptId());
+            sysDept.setParentStoreName(sysDept1.getDeptName());
             //计算天数
             if (ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("beginTime")) && ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("endTime"))) {
                 String beginTimeStr = allOrderInfo.getParams().get("beginTime").toString();