From 95f055b532584226c35bde70705a155d55f41a13 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Sat, 21 Dec 2019 16:51:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E5=B1=82=E7=BA=A7=E5=A4=AA=E5=A4=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Public/Admin/css/select2.min.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Public/Admin/css/select2.min.css b/Public/Admin/css/select2.min.css
index dd493abe7..9cb8b1fa6 100644
--- a/Public/Admin/css/select2.min.css
+++ b/Public/Admin/css/select2.min.css
@@ -7,7 +7,7 @@
 .select2-container .select2-search--inline{float:left;}
 .select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;margin-top:5px;border:none;font-size:100%;}
 .select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none;}
-.select2-dropdown{position:absolute;left:-100000px;z-index:1051;display:block;box-sizing:border-box;width:100%;border:1px solid #aaa;border-radius:4px;background-color:#fff;}
+.select2-dropdown{position:absolute;left:-100000px;z-index:10;display:block;box-sizing:border-box;width:100%;border:1px solid #aaa;border-radius:4px;background-color:#fff;}
 .select2-results{display:block;}
 .select2-results__options{margin:0;padding:0;list-style:none;}
 .select2-results__option{padding:6px;user-select:none;-webkit-user-select:none;}

From b8859837fba44a68928455b00203a18417dd9b00 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Sat, 21 Dec 2019 17:08:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Common/extend.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php
index a49fc2bde..2b7118037 100644
--- a/Application/Admin/Common/extend.php
+++ b/Application/Admin/Common/extend.php
@@ -1552,9 +1552,9 @@ function getAdminData ($uid) {
         ->join('left join sys_auth_group on sys_auth_group_access.group_id=sys_auth_group.id')
         ->where(array('uid'=>$uid))->find();
 
-    $promoteData = M('promote','tab_')->field('id')->where(array('admin_id'=>$uid))->select();
-    $promoteData = implode(',',array_column($promoteData,'id'));
-    $adminData['data_president'] = $adminData['data_president'].','.$promoteData;
+//    $promoteData = M('promote','tab_')->field('id')->where(array('admin_id'=>$uid))->select();
+//    $promoteData = implode(',',array_column($promoteData,'id'));
+//    $adminData['data_president'] = $adminData['data_president'].','.$promoteData;
 
     return $adminData;
 }