From c6a25b49ca57c7ac11b367a06137040efd394c8c Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 27 Nov 2024 10:38:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/order/OrderInfoMapper.xml     | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
index 8f9da8e..d78b9a4 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
@@ -59,19 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN sys_user su ON su.user_id = moi.order_user
         LEFT JOIN (
         SELECT
-        sd.dept_name AS companyName,
-        sd.dept_id AS deptId
+        sd.dept_id AS deptId,
+        sd1.dept_name AS companyName
         FROM
         sys_dept sd
-        JOIN (
-        SELECT
-        SUBSTRING_INDEX(ancestors, ',', 1) AS first_ancestor,
-        dept_id
-        FROM
-        sys_dept
-        ) AS subquery
-        ON sd.dept_id = subquery.dept_id
-        AND sd.dept_id = subquery.first_ancestor
+        JOIN ( SELECT SUBSTRING_INDEX( ancestors, ',', 1 ) AS first_ancestor, dept_id FROM sys_dept ) AS subquery ON sd.dept_id = subquery.dept_id
+        LEFT JOIN sys_dept sd1 ON sd1.parent_id = subquery.first_ancestor
         ) dept ON dept.deptId = su.dept_id
         WHERE
         mt.del_flag = '0'