From 1c04c6a9607b7d4543989c73a1ae91274bbb167c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 15 Mar 2022 18:34:05 +0800
Subject: [PATCH] Merge branch 'developer' into alpha
---
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