From c88892ec59307244888a9443e4e247a01abeed4e Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Fri, 8 Nov 2019 17:44:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Base/Service/PromoteService.class.php   | 6 ++++--
 Application/Home/View/default/Promote/children.html | 8 --------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php
index 41ea0c15f..ff4e5eb57 100644
--- a/Application/Base/Service/PromoteService.class.php
+++ b/Application/Base/Service/PromoteService.class.php
@@ -193,16 +193,18 @@ class PromoteService {
             'chain' => $toPromote['chain'] . $toPromote['id'] . '/'
         ]);
         if (!$status) {
+            $lastSql = M()->getLastSql();
             $model->rollback();
-            return ['status' => false, 'msg' => '系统异常，修改推广员上级失败'];
+            return ['status' => false, 'msg' => '系统异常，修改推广员上级失败[' . $lastSql . ']'];
         }
 
         $status = M('promote', 'tab_')->where($secondMap)->save([
             'chain' => ['exp', 'REPLACE(chain, "/' . $fromPromote['id'] . '/","/' . $toPromote['id'] . '/")'],
         ]);
         if (!$status) {
+            $lastSql = M()->getLastSql();
             $model->rollback();
-            return ['status' => false, 'msg' => '系统异常，修改推广员CHAIN失败'];
+            return ['status' => false, 'msg' => '系统异常，修改推广员CHAIN失败[' . $lastSql . ']'];
         }
 
         $status1 = M('ShiftTask')->where('id=' . $task['id'])->save(['status' => 1, 'handle_time' => time()]);
diff --git a/Application/Home/View/default/Promote/children.html b/Application/Home/View/default/Promote/children.html
index 3b9634435..91070f09a 100644
--- a/Application/Home/View/default/Promote/children.html
+++ b/Application/Home/View/default/Promote/children.html
@@ -100,14 +100,6 @@
                       <?php endif;?>
                     <?php endif;?>
 
-                    <?php if(I('promote_type', 0) == 2):?>
-                      <?php if(!in_array($record['id'], $hasShiftList)):?>
-                      <a href="javascript:;" class="shift-btn editbtn" data-promote-shift-type="2">换组</a>
-                      <?php else:?>
-                      <a href="javascript:;" style="color: red;" data-promote-shift-type="2" class="cancel-shift-btn editbtn">取消换组</a>
-                      <?php endif;?>
-                    <?php endif;?>
-
                     <?php if(in_array($record['id'], $hasPlayerList)):?>
                       <?php if(!in_array($record['id'], $hasShiftPlayerList)):?>
                       <a href="javascript:;" class="shift-player-btn editbtn">玩家迁移</a>