From 62ff723e4ffaecfe11c91145a5aa944c58a1677c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Mar 2022 10:57:23 +0800
Subject: [PATCH] 新增会员,需要从当前操作人员获取公司ID

---
 zq-erp/src/main/resources/templates/views/admin/index.html                |    2 +-
 zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java |    4 +++-
 2 files changed, 4 insertions(+), 2 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 d71a0a0..b4f5c12 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
@@ -13,7 +13,6 @@
 import com.matrix.core.tools.excl.ExcelVersion;
 import com.matrix.system.common.bean.SysUsers;
 import com.matrix.system.common.bean.SystemDictionary;
-import com.matrix.system.common.constance.AppConstance;
 import com.matrix.system.common.dao.CustomerDataDictionaryDao;
 import com.matrix.system.common.service.SysUsersService;
 import com.matrix.system.common.service.SystemDictionaryService;
@@ -301,6 +300,9 @@
             if(vipInfo.getShopId()==null){
                 vipInfo.setShopId(users.getShopId());
             }
+            if(vipInfo.getCompanyId()==null){
+                vipInfo.setCompanyId(users.getCompanyId());
+            }
             return add(vipInfoService, vipInfo, "会员信息");
         }
     }
diff --git a/zq-erp/src/main/resources/templates/views/admin/index.html b/zq-erp/src/main/resources/templates/views/admin/index.html
index bc60ea8..c6f48a8 100644
--- a/zq-erp/src/main/resources/templates/views/admin/index.html
+++ b/zq-erp/src/main/resources/templates/views/admin/index.html
@@ -24,7 +24,7 @@
 
 <body class="fixed-sidebar full-height-layout gray-bg"
       style="overflow: hidden">
-<div id="wrapper">
+<div id="wrapper" v-cloak>
     <!--左侧导航开始-->
     <nav class="navbar-default navbar-static-side" role="navigation">
         <div class="nav-close">

--
Gitblit v1.9.1