From c678f3a069f3fd92ed4b4a41447324e978dc0f70 Mon Sep 17 00:00:00 2001
From: yiyan <thelongcode@163.com>
Date: Wed, 24 Oct 2018 18:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/view/vip/vipMember.jsp   | 4 ++--
 src/main/webapp/WEB-INF/view/vip/vipReferrer.jsp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/view/vip/vipMember.jsp b/src/main/webapp/WEB-INF/view/vip/vipMember.jsp
index 01c55f8..77d5e49 100644
--- a/src/main/webapp/WEB-INF/view/vip/vipMember.jsp
+++ b/src/main/webapp/WEB-INF/view/vip/vipMember.jsp
@@ -422,7 +422,7 @@
                                                 <select id="smsType" name="smsType" class="form-control" onchange="changeSmsContent();">
                                                     <option value="SMS_139227937">活动通知</option>
                                                     <option value="SMS_143712160">证书到期通知</option>
-                                                    <option value="SMS_142146107">会员到期通知</option>
+                                                    <option value="SMS_143717029">会员到期通知</option>
                                                     <option value="SMS_142146106">学员培训通知</option>
                                                 </select>
                                             </div>
@@ -521,7 +521,7 @@
                                             </div>
                                         </div>
                                         <!-- 会员到期通知 -->
-                                        <div id="SMS_142146107" style="display: none;">
+                                        <div id="SMS_143717029" style="display: none;">
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">会员到期时间<span style="color:red;">*</span></label>
diff --git a/src/main/webapp/WEB-INF/view/vip/vipReferrer.jsp b/src/main/webapp/WEB-INF/view/vip/vipReferrer.jsp
index 110491f..2566a23 100644
--- a/src/main/webapp/WEB-INF/view/vip/vipReferrer.jsp
+++ b/src/main/webapp/WEB-INF/view/vip/vipReferrer.jsp
@@ -44,7 +44,7 @@
                         {"mData": "referrerName", "bSortable": false},
                         {"mData": "referrerCard", "bSortable": false},
                         {"mData": function(vipReferrer) {
-                                return vipReferrer.referrerType.typeName == null ? '' : vipReferrer.referrerType.typeName;
+                                return vipReferrer.referrerType == null ? '' : vipReferrer.referrerType.typeName;
                         },"bSortable": false },
                         {"mData": "referrerBirthday", "bSortable": false},
                         {"mData": "referrerTel", "bSortable": false},
@@ -148,7 +148,7 @@
                            $("#referrerName").val(data.referrerName);
                            $("#referrerCard").val(data.referrerCard);
                            $("#referrerType option").each(function() {
-                               if ($(this).val() == data.referrerType.typeId) {
+                               if (data.referrerType != null && $(this).val() == data.referrerType.typeId) {
                                    $(this).attr("selected",true);
                                }
                            });