From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/fee/FeePrintPageV1ServiceDaoImplMapper.xml |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/FeePrintPageV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeePrintPageV1ServiceDaoImplMapper.xml
index b4333a4..eaffb37 100644
--- a/java110-db/src/main/resources/mapper/fee/FeePrintPageV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeePrintPageV1ServiceDaoImplMapper.xml
@@ -18,8 +18,9 @@
     <!-- 鏌ヨ鏀舵嵁妯℃澘淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getFeePrintPageInfo" parameterType="Map" resultType="Map">
         select t.page_url,t.page_url pageUrl,t.status_cd,t.status_cd statusCd,t.state,t.page_id,t.page_id
-        pageId,t.community_id,t.community_id communityId,t.page_name,t.page_name pageName
+        pageId,t.community_id,t.community_id communityId,t.page_name,t.page_name pageName,pt.name templateName,pt.url
         from fee_print_page t
+        LEFT JOIN fee_print_page_template pt on t.page_url = pt.template_id and pt.status_cd = '0'
         where 1 =1
         <if test="pageUrl !=null and pageUrl != ''">
             and t.page_url= #{pageUrl}
@@ -59,16 +60,19 @@
         <if test="state !=null and state != ''">
             , t.state= #{state}
         </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
-        </if>
         <if test="pageName !=null and pageName != ''">
             , t.page_name= #{pageName}
         </if>
         where 1=1
+        <if test="queryStatusCd !=null and queryStatusCd != ''">
+            and t.status_cd= #{queryStatusCd}
+        </if>
         <if test="pageId !=null and pageId != ''">
             and t.page_id= #{pageId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </update>
 

--
Gitblit v1.8.0