From bc2efbdb52190fe2e7be9920bbed6902d4ee28aa Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期五, 21 八月 2026 11:53:37 +0800
Subject: [PATCH] fix: centralize merchant type integration
---
talent-card-server/src/main/java/com/talentcard/server/mapper/MerchantDisplayPolicyMerchantMapper.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/talent-card-server/src/main/java/com/talentcard/server/mapper/MerchantDisplayPolicyMerchantMapper.java b/talent-card-server/src/main/java/com/talentcard/server/mapper/MerchantDisplayPolicyMerchantMapper.java
index ee689f5..e997143 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/mapper/MerchantDisplayPolicyMerchantMapper.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/mapper/MerchantDisplayPolicyMerchantMapper.java
@@ -37,7 +37,7 @@
from merchant m
where m.deleted = 0
<if test="merchantId != null">and m.id = #{merchantId}</if>
- <if test="merchantType != null and merchantType != ''">and m.merchant_type = #{merchantType}</if>
+ <if test="merchantType != null and merchantType != ''">and m.merchant_type_code = #{merchantType}</if>
<if test="status != null">and m.status = #{status}</if>
<if test="keyword != null and keyword != ''">
and (m.merchant_name like concat('%', #{keyword}, '%')
@@ -73,7 +73,7 @@
from merchant m
where m.deleted = 0
<if test="merchantId != null">and m.id = #{merchantId}</if>
- <if test="merchantType != null and merchantType != ''">and m.merchant_type = #{merchantType}</if>
+ <if test="merchantType != null and merchantType != ''">and m.merchant_type_code = #{merchantType}</if>
<if test="status != null">and m.status = #{status}</if>
<if test="keyword != null and keyword != ''">
and (m.merchant_name like concat('%', #{keyword}, '%')
@@ -164,7 +164,7 @@
)
where m.deleted = 0
and m.status = 1
- <if test="merchantType != null and merchantType != ''">and m.merchant_type = #{merchantType}</if>
+ <if test="merchantType != null and merchantType != ''">and m.merchant_type_code = #{merchantType}</if>
<if test="keyword != null and keyword != ''">
and (m.merchant_name like concat('%', #{keyword}, '%')
or m.contact_mobile like concat('%', #{keyword}, '%')
@@ -186,7 +186,7 @@
from merchant m
where m.deleted = 0
and m.status = 1
- <if test="merchantType != null and merchantType != ''">and m.merchant_type = #{merchantType}</if>
+ <if test="merchantType != null and merchantType != ''">and m.merchant_type_code = #{merchantType}</if>
<if test="keyword != null and keyword != ''">
and (m.merchant_name like concat('%', #{keyword}, '%')
or m.contact_mobile like concat('%', #{keyword}, '%')
--
Gitblit v1.7.1