From 613d60e4a7416fda803fb25e5a8845b5db71df11 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 27 Apr 2020 09:47:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PromoteCompanyController.class.php | 15 +++++++++++++++
 .../PromoteCompany/promotedataconfigindex.html    | 13 ++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index a2e52ec76..d4825c0dd 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -528,6 +528,21 @@ WHERE old_change_promote_id in ({$promoteData})";
 
         } else {
 
+            $promoteData = M("promote","tab_")
+                ->field("id")
+                ->where(['company_belong'=>2])
+                ->select();
+
+            $promoteData = implode(',',array_column($promoteData,'id'));
+
+            $spendData = M('spend','tab_')->field("old_change_promote_account")->where(['old_change_promote_id'=>['in',$promoteData]])->find();
+
+//            var_dump($spendData);die();
+
+            if ($spendData['old_change_promote_account']) {
+                $this->assign('old_change_promote_account',1);
+            }
+
             $this->display('promotedataconfigindex');
 
         }
diff --git a/Application/Admin/View/PromoteCompany/promotedataconfigindex.html b/Application/Admin/View/PromoteCompany/promotedataconfigindex.html
index 34cf638d0..98ac23e40 100644
--- a/Application/Admin/View/PromoteCompany/promotedataconfigindex.html
+++ b/Application/Admin/View/PromoteCompany/promotedataconfigindex.html
@@ -52,8 +52,8 @@
                             <td class="r" >
                                 <div class="input-list input-list-server search_label_rehab" style="margin:0;">
                                     <select id="admin_type" name="admin_type" class="select_gallery" style="width: 215px;">
-                                        <option value="1">无</option>
-                                        <option value="2">市场专员</option>
+                                        <option value="1" <if condition="$old_change_promote_account eq 1"> selected </if>>无</option>
+                                        <option value="2" <if condition="$old_change_promote_account neq 1"> selected </if>>市场专员</option>
                                     </select>
                                 </div>
                             </td>
@@ -142,13 +142,8 @@
                     data: cres,
                     dataType: "json",
                     success: function (data) {
-                        if (data.status == 1) {
-                            layer.msg(data.info, function () {
-                                window.location.href = "{:U('PromoteCompany/promoteDataConfigIndex')}";
-                            });
-                        } else {
-                            layer.msg(data.info);
-                        }
+                        layer.msg(data.info);
+                        window.location.reload();
                     },
                     error: function (e) {