From b1848fe78bec2a127e17a661297be9a5ca35242a Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Tue, 21 May 2024 14:19:57 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/basicdata/mapper/BasicdataPriceMapper.xml   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml
index efd69243c..50d0253cd 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml
@@ -10,8 +10,8 @@
     <select id="selectBasicdataPricePage" resultType="com.logpm.basicdata.vo.BasicdataPricePageVO">
         select t.id,
         cli.client_name,
-        t.brand_id,
-        t.client_id,
+        lbsb.brand_id,
+        lbsb.client_id,
         t.template_id,
         ldb.brand_name,
         lbpt.service_type,
@@ -26,8 +26,8 @@
         from logpm_basicdata_store_brand lbsb
         left join logpm_basicdata_client cli on cli.id = lbsb.client_id
         left join logpm_basicdata_price t on lbsb.client_id = t.client_id
-        and lbsb.brand_id = t.brand_id and t.effective_time <![CDATA[ <= ]]> now() and t.expiry_time >= now()
-        left join logpm_basicdata_brand ldb on ldb.id = t.brand_id
+        and lbsb.brand_id = t.brand_id and t.effective_time  <![CDATA[ <= ]]>  now() and t.expiry_time >= now()
+        left join logpm_basicdata_brand ldb on ldb.id = lbsb.brand_id
         left join logpm_basicdata_price_template lbpt on t.template_id = lbpt.id
         where lbsb.is_deleted = 0
         <if test="basicdataPrice.clientName != null and basicdataPrice.clientName != ''">