Merge branch 'master' of http://git.liuniu946.com/Kirin/mccs

crmeb/services/WechatService.php

@@ -95,7 +95,7 @@ class WechatService
                                             $uid = WechatUser::openidToUid($message->FromUserName, 'openid');
                                             if ($spreadUid == $uid) return '自己不能推荐自己';
                                             $userInfo = User::getUserInfo($uid);
-                                            if ($userInfo['spread_uid']) return '已有推荐人!';
+                                            if ($userInfo['spread_uid'] && $userInfo['lock_spread']) return '已有推荐人!';
                                             if (!User::setSpreadUid($userInfo['uid'], $spreadUid)) {
                                                 $response = '绑定推荐人失败!';
                                             }
@@ -119,7 +119,7 @@ class WechatService
                                         $uid = WechatUser::openidToUid($message->FromUserName, 'openid');
                                         if ($spreadUid == $uid) return '自己不能推荐自己';
                                         $userInfo = User::getUserInfo($uid);
-                                        if ($userInfo['spread_uid']) return '已有推荐人!';
+                                        if ($userInfo['spread_uid'] && $userInfo['lock_spread']) return '已有推荐人!';
                                         if (User::setSpreadUid($userInfo['uid'], $spreadUid)) {
                                             $response = '绑定推荐人失败!';
                                         }