From a7bfbd1076e18d1e540e79ea5e035db014a2bb7f Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Sat, 24 Feb 2024 09:44:49 +0800
Subject: [PATCH] update

---
 .../resources/mapper/pile/PileBillingTemplateMapper.xml  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
index 24e0bde73..cd6325929 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
@@ -342,7 +342,7 @@
             t2.template_code as templateCode,
             t2.name as templateName,
             t2.status,
-            t2.remark as remark,
+            t2.template_remark as remark,
             t2.type as deviceType,
             t2.free_time as freeTime,
             t2.occupy_fee as occupyFee,
@@ -373,6 +373,9 @@
         <if test="memberFlag != null and memberFlag != ''">
             and t2.member_flag = #{memberFlag,jdbcType=VARCHAR}
         </if>
+        <if test="memberFlag == null">
+            and t2.member_flag = '0'
+        </if>
         <!--数据范围过滤-->
         <if test="stationDeptIds != null and stationDeptIds.size() != 0">
             and t1.dept_id in
@@ -529,7 +532,7 @@
         t2.id as templateId,
         t2.template_code as templateCode,
         t2.name as templateName,
-        t2.remark as remark,
+        t2.template_remark as remark,
         t2.type as deviceType,
         t2.free_time as freeTime,
         t2.occupy_fee as occupyFee,
@@ -567,7 +570,7 @@
             t2.id as templateId,
             t2.template_code as templateCode,
             t2.name as templateName,
-            t2.remark as remark,
+            t2.template_remark as remark,
             t2.type as deviceType,
             t2.publish_time as publishTime,
             t3.electricity_price AS sharpElectricityPrice,