From 1d8b7df974e1fbdacff7632b05bdc30d78a6a8c1 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 25 Oct 2021 13:30:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSkinCheckAction.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSkinCheckAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSkinCheckAction.java
index 8779cd3..7ea213a 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSkinCheckAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSkinCheckAction.java
@@ -4,6 +4,7 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.StringUtils;
+import com.matrix.system.common.interceptor.HostInterceptor;
import com.matrix.system.hive.bean.SysSkinCheckRecord;
import com.matrix.system.hive.bean.SysSkinDetail;
import com.matrix.system.hive.bean.SysVipInfo;
@@ -77,7 +78,7 @@
});
sysSkinCheckRecord.setSkinDetails(detailList);
- SysVipInfo vipInfo = vipInfoDao.selectByPhone(sysSkinCheckRecord.getTelphone());
+ SysVipInfo vipInfo = vipInfoDao.selectByPhone(sysSkinCheckRecord.getTelphone(), HostInterceptor.getCompanyId());
AjaxResult result=AjaxResult.buildSuccessInstance(Arrays.asList(sysSkinCheckRecord));
result.putInMap("vipInfo",vipInfo);
return result;
--
Gitblit v1.9.1