From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'

---
 zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml b/zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml
index c9afd1d..5c612dd 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml
@@ -231,6 +231,9 @@
 			<if test="_parameter.containsKey('comPlats')">
 				com_plats = #{comPlats},
 			</if>
+			<if test="_parameter.containsKey('comCode')">
+				com_code = #{comCode},
+			</if>
 		</set>
 		WHERE com_id=#{comId}
 	</update>
@@ -694,7 +697,8 @@
 		com_logo,
 		com_valid,
 		com_functions,
-		com_plats
+		com_plats,
+		com_code
 		from sys_company
 		where com_id=#{comId}
 	</select>
@@ -757,7 +761,8 @@
 		com_logo,
 		com_valid,
 		com_functions,
-		com_plats
+		com_plats,
+		com_code
 		from sys_company
 		<where>
 			<if test="record!=null">
@@ -846,10 +851,17 @@
 					and com_functions = #{record.comFunctions}
 				</if>
 				<if
-					test="(record.comPlats!=null and record.comPlats!='') or (record.comPlats!='' and record.comPlats==0)">
+						test="(record.comPlats!=null and record.comPlats!='') or (record.comPlats!='' and record.comPlats==0)">
 					and com_plats = #{record.comPlats}
+				</if>
+				<if
+						test="(record.comCode!=null and record.comCode!='') or (record.comCode!='' and record.comCode==0)">
+					and com_code = #{record.comCode}
 				</if>
 			</if>
 		</where>
 	</select>
+	<select id="selectAll" resultMap="SysCompanyMap">
+		select * from sys_company
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1