From 5eedd9c5aa0776f30723aa748ac84a1feefd1577 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 28 Jul 2021 16:54:05 +0800
Subject: [PATCH] 1

---
 zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
index acfe1fd..3aefd94 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
@@ -293,7 +293,9 @@
         } else {
             vipInfo.setVipState(Dictionary.VIP_STATE_HY);
             SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-            vipInfo.setShopId(users.getShopId());
+            if(vipInfo.getShopId()==null){
+                vipInfo.setShopId(users.getShopId());
+            }
             return add(vipInfoService, vipInfo, "会员信息");
         }
     }

--
Gitblit v1.9.1