From 8287f743a1ac2fd5330f6dd7ca08255df193ae03 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Fri, 09 Jul 2021 20:50:16 +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, 3 insertions(+), 1 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 034df56..78e2713 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 @@ -120,7 +120,9 @@ } } SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); - sysVipInfo.setCompanyId(user.getCompanyId()); + if(user!=null){ + sysVipInfo.setCompanyId(user.getCompanyId()); + } sysVipInfo.setCreateTime(new Date()); sysVipInfo.setPointAll(0); sysVipInfo.setIsDeal(SysVipInfo.UNDEAL_VIP); -- Gitblit v1.9.1