From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopAdvertisDao.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopAdvertisDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopAdvertisDao.xml
index e8b87b0..b0a7931 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopAdvertisDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopAdvertisDao.xml
@@ -20,6 +20,7 @@
<result property="linkType" column="link_type"/>
<result property="linkUrl" column="link_url"/>
<result property="companyId" column="company_id" />
+ <result property="pageId" column="page_id" />
</resultMap>
@@ -38,6 +39,7 @@
<result property="remarks" column="remarks" />
<result property="linkType" column="link_type"/>
<result property="linkUrl" column="link_url"/>
+ <result property="pageId" column="page_id" />
<result property="companyId" column="company_id" />
</resultMap>
@@ -56,6 +58,7 @@
remarks,
link_type,
link_url,
+page_id,
company_id
</sql>
@@ -74,6 +77,7 @@
#{item.remarks},
#{item.linkType},
#{item.linkUrl},
+ #{item.pageId},
#{item.companyId}
</sql>
@@ -101,6 +105,9 @@
</if>
<if test="(record.remarks!=null and record.remarks!='') or (record.remarks!='' and record.remarks==0) ">
and remarks = #{record.remarks}
+ </if>
+ <if test="(record.pageId!=null and record.pageId!='') or (record.pageId!='' and record.pageId==0) ">
+ and page_id = #{record.pageId}
</if>
<if test="record.companyId != null and record.companyId !='' ">
and company_id = #{record.companyId}
@@ -167,6 +174,10 @@
link_type = #{linkType},
</if>
+ <if test="_parameter.containsKey('pageId')">
+ page_id = #{pageId},
+ </if>
+
</set>
WHERE id=#{id}
@@ -206,6 +217,10 @@
company_id = #{record.companyId}
</if>
+ <if test="record.pageId != null and record.pageId !='' ">
+ page_id = #{record.pageId}
+ </if>
+
</set>
WHERE id=#{record.id}
</update>
@@ -232,8 +247,8 @@
<include refid="where_sql" ></include>
</where>
</delete>
-
-
+
+
<!-- 分页查询 -->
<select id="selectInPage" resultType="com.matrix.system.shopXcx.bean.ShopAdvertis">
@@ -249,6 +264,7 @@
ad.type_id typeId,
ad.sort,
ad.remarks,
+ ad.page_id,
IFNULL(adType.adt_name ,'无分类') adtName
from shop_advertis ad
left join shop_advertis_type adType
--
Gitblit v1.9.1