From e2c9223fb3ba6f1604b5c7fe2a8fa261d6006994 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 29 Jun 2019 15:36:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=95=86=E6=88=B7=E5=90=8D=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/basic/WxMerchantController.java | 1 + mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 33c5524f4..35c231041 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -222,6 +222,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-查看是否存在商户名称相同记录") public ResultData hasMerchant(@ModelAttribute WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::hasMerchant"); + wxMerchant.setTenantId(getTenantId()); boolean has = wxMerchantService.hasMerchant(wxMerchant); return new ResultData(has); } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 1cc727582..203a037db 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -245,7 +245,7 @@