From e7eea688585603c5a8f134d92762e8431d885d36 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:59:11 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 3aeda07..0a6530e 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml
@@ -12,7 +12,7 @@
<result property="companyId" column="company_id" />
<result property="plates" column="plates" />
<result property="shopAble" column="shop_able" />
- <result property="coustomer" column="coustomer" />
+ <result property="customer" column="customer" />
</resultMap>
@@ -32,7 +32,7 @@
company_id,
plates,
is_default,
- coustomer,
+ customer,
shop_able
)
VALUES (
@@ -46,7 +46,7 @@
#{companyId},
#{plates},
#{isDefault},
- #{coustomer},
+ #{customer},
#{shopAble}
)
</insert>
@@ -66,7 +66,7 @@
company_id,
plates,
is_default,
- coustomer,
+ customer,
shop_able
)
VALUES
@@ -82,7 +82,7 @@
#{item.companyId},
#{item.plates},
#{item.isDefault},
- #{item.coustomer},
+ #{item.customer},
#{item.shopAble}
)
</foreach>
@@ -115,8 +115,8 @@
<if test="_parameter.containsKey('shopAble')">
shop_able = #{shopAble},
</if>
- <if test="_parameter.containsKey('coustomer')">
- coustomer = #{coustomer},
+ <if test="_parameter.containsKey('customer')">
+ customer = #{customer},
</if>
</set>
WHERE role_id=#{roleId}
@@ -150,8 +150,8 @@
<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 test="(customer!=null and customer!='') or (customer!='' and customer==0)">
+ customer = #{customer},
</if>
</set>
WHERE role_id=#{roleId}
@@ -217,7 +217,7 @@
company_id,
plates,
is_default,
- coustomer,
+ customer,
shop_able
from sys_role
<where>
@@ -303,7 +303,7 @@
company_id,
plates,
is_default,
- coustomer,
+ customer,
shop_able
from sys_role
where role_id=#{roleId}
@@ -336,7 +336,7 @@
company_id,
plates,
is_default,
- coustomer,
+ customer,
shop_able
from sys_role
<where>
--
Gitblit v1.9.1