From c1447c721aa0e0157e4bd768801c93a18cf4632b Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Mon, 2 Dec 2024 17:38:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=B8=82=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/device/DevInfoMapper.xml  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index f2695a6..2fd5091 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -529,20 +529,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectCompanyList" resultType="com.bonus.common.biz.domain.BmCompanyInfo">
-        select
-        company_id as companyId,
-        company_name as companyName,
-        register_address as registerAddress,
-        operate_address as operateAddress
-        from bm_company_info
-        <where>
-            <if test="companyId != null">
-                and company_id = #{companyId}
-            </if>
-            <if test="companyName != null and companyName != ''">
-                and company_name like concat('%',#{companyName},'%')
-            </if>
-        </where>
+        SELECT
+        sd.dept_id as companyId,
+        sd.dept_name as companyName,
+        b.operate_address as operateAddress
+        FROM
+        sys_dept sd
+        LEFT JOIN bm_company_info b ON sd.dept_id = b.company_id
+        WHERE sd.parent_id = 0 and sd.order_num != 0
+        <if test="companyId != null">
+            and sd.dept_id = #{companyId}
+        </if>
+        <if test="companyName != null and companyName != ''">
+            and sd.dept_name like concat('%',#{companyName},'%')
+        </if>
     </select>
 
     <select id="getBookCar" resultType="com.bonus.material.book.domain.BookCarInfoDto">