From 4915ebc70cde1a1d561095f47deea074450948c4 Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Mon, 25 Nov 2019 20:15:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98oa=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/PromoteController.class.php | 2 +-
 Application/Admin/View/Promote/lists.html                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index 041433688..5eefc0632 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -70,7 +70,7 @@ unset($_REQUEST['parent_id']);
 				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Promote/lists/type/1','status'=>1])->find());
         if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;}
 
-        if(!empty(I('oa_associated'))) {
+        if(!empty(I('oa_associated')) || !is_null(I('oa_associated'))) {
             $map['oa_associated'] = I('oa_associated');
             $oa_data = [];
             for($i = 1; $i > 0; $i++) {
diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html
index 95b87420d..13cadf0aa 100644
--- a/Application/Admin/View/Promote/lists.html
+++ b/Application/Admin/View/Promote/lists.html
@@ -131,7 +131,7 @@
             <select name="oa_associated">
                 <option value="">oa关联</option>
                 <option value="1">已关联</option>
-                <option value="2">未关联</option>
+                <option value="0">未关联</option>
             </select>
             </div>
         <else/>
@@ -153,7 +153,7 @@
             <select name="oa_associated">
                 <option value="">oa关联</option>
                 <option value="1">已关联</option>
-                <option value="2">未关联</option>
+                <option value="0">未关联</option>
             </select>
         </div>
         </empty>