地市增加

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>
+        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 company_id = #{companyId}
+            and sd.dept_id = #{companyId}
         </if>
         <if test="companyName != null and companyName != ''">
-                and company_name like concat('%',#{companyName},'%')
+            and sd.dept_name like concat('%',#{companyName},'%')
         </if>
-        </where>
     </select>
 
     <select id="getBookCar" resultType="com.bonus.material.book.domain.BookCarInfoDto">