From f50e081f650eb067cce44fce3db64a237fde145b Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 13:44:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
index 4232a60..b5a3280 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
@@ -116,7 +116,7 @@
 			}
 			if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "PHONE", sysVipInfo.getPhone(),
 					"company_id",sysVipInfo.getCompanyId() )) {
-				throw new GlobleException("手机已被注册!");
+				throw new GlobleException(sysVipInfo.getPhone()+"手机已被注册!");
 			}
 		}
 
@@ -400,7 +400,7 @@
 					SysVipInfo vipInfo = new SysVipInfo();
 					vipInfo.setVipNo(objects.get(0).toString());
 
-					SysVipInfo exist = sysVipInfoDao.selectByPhone(objects.get(3).toString());
+					SysVipInfo exist = sysVipInfoDao.selectByPhone(objects.get(3).toString(),sysUsers.getCompanyId());
 					if (exist != null) {
 						continue;
 					}

--
Gitblit v1.9.1