From 86e03c7b2b4645f5791048f97c78768e884614f7 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Thu, 19 May 2022 18:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ghy-admin/src/main/resources/application.yaml | 14 ++++-----
 .../mapper/customer/CustomerMapper.xml        | 31 +++++++++----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/ghy-admin/src/main/resources/application.yaml b/ghy-admin/src/main/resources/application.yaml
index 27f3e6b7..2c11721c 100644
--- a/ghy-admin/src/main/resources/application.yaml
+++ b/ghy-admin/src/main/resources/application.yaml
@@ -30,7 +30,7 @@ server:
       max: 800
       # Tomcat启动初始化的线程数，默认值10
       min-spare: 100
- 
+
 # 日志配置
 logging:
   level:
@@ -58,7 +58,7 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
-  profiles: 
+  profiles:
     active: druid
   # 文件上传
   servlet:
@@ -83,10 +83,10 @@ mybatis:
     configLocation: classpath:mybatis/mybatis-config.xml
 
 # PageHelper分页插件
-pagehelper: 
+pagehelper:
   helperDialect: mysql
   supportMethodsArguments: true
-  params: count=countSql 
+  params: count=countSql
 
 # Shiro
 shiro:
@@ -103,7 +103,7 @@ shiro:
     captchaType: math
   cookie:
     # 设置Cookie的域名 默认空，即当前访问的域名
-    domain: 
+    domain:
     # 设置cookie的有效访问路径
     path: /
     # 设置HttpOnly属性
@@ -111,7 +111,7 @@ shiro:
     # 设置Cookie的过期时间，天为单位
     maxAge: 30
     # 设置密钥，务必保持唯一性（生成方式，直接拷贝到main运行即可）Base64.encodeToString(CipherUtils.generateNewKey(128, "AES").getEncoded()) （默认启动生成随机秘钥，随机秘钥会导致之前客户端RememberMe Cookie无效，如设置固定秘钥RememberMe Cookie则有效）
-    cipherKey: 
+    cipherKey:
   session:
     # Session超时时间，-1代表永不过期（默认30分钟）
     expireTime: 30
@@ -128,7 +128,7 @@ shiro:
     enabled: true
 
 # 防止XSS攻击
-xss: 
+xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）
diff --git a/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml b/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml
index 35235082..839763dd 100644
--- a/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml
+++ b/ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml
@@ -13,7 +13,6 @@
         <result property="customerLogoUrl"     column="customer_logo_url"     />
         <result property="customerPlace"     column="customer_place"     />
         <result property="parentCustomerPlace"     column="parent_customer_place"     />
-        <result property="customerLogoUrl"     column="customer_logo_url"     />
         <result property="createBy"            column="create_by"     />
         <result property="createTime"          column="create_time"   />
         <result property="updateBy"            column="update_by"     />
@@ -26,7 +25,7 @@
                customer_logo_url, customer_place, parent_customer_place, create_by, create_time, remark
         FROM customer
     </sql>
-    
+
     <select id="getCustomerList" resultMap="CustomerResult">
         <include refid="selectCustomer" />
         <where>
@@ -69,15 +68,15 @@
         <if test="createBy != null and createBy != ''">create_by,</if>
         create_time
         )values(
-        <if test="customerId != null and customerId != 0">${customer_id},</if>
-        <if test="name != null and name != ''">${name},</if>
-        <if test="account != null and account != ''">${account},</if>
-        <if test="phone != null and phone != ''">${phone},</if>
-        <if test="customerLogoUrl != null and customerLogoUrl != ''">${customer_logo_url},</if>
-        <if test="openId != null and openId != ''">${open_id},</if>
-        <if test="status != null and status != ''">${status},</if>
-        <if test="remark != null and remark != ''">${remark},</if>
-        <if test="createBy != null and createBy != ''">${create_by},</if>
+        <if test="customerId != null and customerId != 0">#{customerId},</if>
+        <if test="name != null and name != ''">#{name},</if>
+        <if test="account != null and account != ''">#{account},</if>
+        <if test="phone != null and phone != ''">#{phone},</if>
+        <if test="customerLogoUrl != null and customerLogoUrl != ''">#{customerLogoUrl},</if>
+        <if test="openId != null and openId != ''">#{openId},</if>
+        <if test="status != null and status != ''">#{status},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
         sysdate()
         )
     </insert>
@@ -85,10 +84,10 @@
     <update id="updateCustomer" parameterType="com.ghy.customer.domain.Customer">
         update costomer
         <set>
-            <if test="name != null and name != ''">name = ${name},</if>
-            <if test="account != null and account != ''">account = ${account},</if>
-            <if test="phone != null and phone != ''">phone = ${phone},</if>
-            <if test="customerLogoUrl != null and customerLogoUrl != ''">customer_logo_url = ${customer_logo_url},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="account != null and account != ''">account = #{account},</if>
+            <if test="phone != null and phone != ''">phone = #{phone},</if>
+            <if test="customerLogoUrl != null and customerLogoUrl != ''">customer_logo_url = #{customerLogoUrl},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
@@ -97,4 +96,4 @@
         where customer_id = #{customerId}
     </update>
 
-</mapper>
\ No newline at end of file
+</mapper>