From a27c45a501d059bca456bac7b561786232d3ecf3 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 31 Jul 2021 17:30:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml b/zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml
index c4b7ee8..3aeda07 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml
@@ -12,6 +12,7 @@
<result property="companyId" column="company_id" />
<result property="plates" column="plates" />
<result property="shopAble" column="shop_able" />
+ <result property="coustomer" column="coustomer" />
</resultMap>
@@ -31,6 +32,7 @@
company_id,
plates,
is_default,
+ coustomer,
shop_able
)
VALUES (
@@ -44,6 +46,7 @@
#{companyId},
#{plates},
#{isDefault},
+ #{coustomer},
#{shopAble}
)
</insert>
@@ -63,6 +66,7 @@
company_id,
plates,
is_default,
+ coustomer,
shop_able
)
VALUES
@@ -78,6 +82,7 @@
#{item.companyId},
#{item.plates},
#{item.isDefault},
+ #{item.coustomer},
#{item.shopAble}
)
</foreach>
@@ -110,6 +115,9 @@
<if test="_parameter.containsKey('shopAble')">
shop_able = #{shopAble},
</if>
+ <if test="_parameter.containsKey('coustomer')">
+ coustomer = #{coustomer},
+ </if>
</set>
WHERE role_id=#{roleId}
</update>
@@ -141,6 +149,9 @@
</if>
<if test="(shopAble!=null and shopAble!='') or (shopAble!='' and shopAble==0)">
shop_able = #{shopAble},
+ </if>
+ <if test="(coustomer!=null and coustomer!='') or (coustomer!='' and coustomer==0)">
+ coustomer = #{coustomer},
</if>
</set>
WHERE role_id=#{roleId}
@@ -206,6 +217,7 @@
company_id,
plates,
is_default,
+ coustomer,
shop_able
from sys_role
<where>
@@ -291,6 +303,7 @@
company_id,
plates,
is_default,
+ coustomer,
shop_able
from sys_role
where role_id=#{roleId}
@@ -323,6 +336,7 @@
company_id,
plates,
is_default,
+ coustomer,
shop_able
from sys_role
<where>
--
Gitblit v1.9.1