From 4f1a0c89b40a99e7e3b6ec72b42a1b9d6bac971a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 28 Jan 2021 15:36:19 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml
index c45c853..bb312b7 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml
@@ -12,8 +12,10 @@
 			<result property="description" column="description" />
 			<result property="url" column="url" />
 			<result property="icon" column="icon" />
-			<result property="type" column="type" />
+		<result property="type" column="type" />
+		<result property="parentIds" column="parent_ids" />
 		<result property="shopId" column="shop_id"/>
+		<result property="companyId" column="company_id" />
 			<!--扩展属性  -->
 			<!-- <association property="article" javaType="Article"
 			column="{type_id=id}" select="com.matrix.system.hive.dao.ArticleDao.selectById" /> -->
@@ -30,7 +32,9 @@
 			url,
 			icon,
 			type,
-			shop_id
+			shop_id,
+			company_id,
+			parent_ids
 		)
 	VALUES (
 			#{id},
@@ -41,7 +45,9 @@
 			#{url},
 			#{icon},
 			#{type},
-			#{shopId}
+			#{shopId},
+			#{companyId},
+			#{parentIds}
 	)
 	</insert>
 	
@@ -70,7 +76,10 @@
 				</if>		
 				<if test="type != null and type !='' ">
 					type = #{type},
-				</if>		
+				</if>
+				<if test="parentIds != null and parentIds !='' ">
+					parent_ids = #{parentIds},
+				</if>
 		</set>
 		WHERE id=#{id} 
 	</update>
@@ -223,7 +232,7 @@
 			<if test="record.articleTypeName != null and record.articleTypeName !='' ">
 				and article_type_name = #{record.articleTypeName}
 			</if>
-			<if test="record.parentId != null and record.parentId !='' ">
+			<if test="record.parentId != null or record.parentId ==0 ">
 				and parent_id = #{record.parentId}
 			</if>
 			<if test="record.sort != null and record.sort !='' ">
@@ -244,6 +253,9 @@
 			<if test="record.shopId != null and record.shopId !='' ">
 				and shop_id = #{record.shopId}
 			</if>
+			<if test="record.companyId != null and record.companyId !='' ">
+				and company_id = #{record.companyId}
+			</if>
 		</if>
 	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1