修改bug

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml

@@ -116,8 +116,50 @@
 
 
     <select id="getShowInfoByOpenId" resultType="com.nu.entity.SuppliersApplyEntity">
-        select a.*,b.apply_status,b.apply_content,a.id as suppliersId from nu_biz_suppliers_info a
-        left join nu_biz_suppliers_apply b on a.id = b.suppliers_id and b.iz_history = 'N'
-        where a.open_id = #{openId}
+        SELECT
+        a.id,
+        a.suppliers_name,
+        a.suppliers_nature,
+        a.suppliers_address,
+        a.opening_bank_no,
+        a.person_in_charge,
+        a.contact_number,
+        a.supply_state,
+        a.opening_bank,
+        a.open_id,
+        a.img_path,
+        a.iz_wlxx,
+        b.apply_status,
+        b.apply_content,
+        a.id AS suppliersId
+        FROM
+        nu_biz_suppliers_info a
+        LEFT JOIN nu_biz_suppliers_apply b ON a.id = b.suppliers_id
+        AND b.iz_history = 'N'
+        WHERE
+        a.open_id = #{openId}
+        UNION ALL
+        SELECT
+        a.id,
+        a.suppliers_name,
+        a.suppliers_nature,
+        a.suppliers_address,
+        a.opening_bank_no,
+        a.person_in_charge,
+        a.contact_number,
+        a.supply_state,
+        a.opening_bank,
+        a.open_id,
+        a.img_path,
+        '' AS iz_wlxx,
+        a.apply_status,
+        a.apply_content,
+        a.suppliers_id
+        FROM
+        nu_biz_suppliers_apply a
+        WHERE
+        open_id = #{openId}
+        AND iz_history = 'N'
+        AND opt_type = '入驻' and suppliers_id is null
     </select>
 </mapper>