oa关联

Application/Admin/Controller/PromoteController.class.php

@@ -106,6 +106,7 @@ unset($_REQUEST['parent_id']);
         }
         $list_data = D(self::model_name)->where($map)->order('id DESC')->page($p,$row)->select();
         $oa_data = [];
+        if(I('oa_associated',-1) == -1) {
             foreach($list_data as $k => $v)
             {
                 if($v['oa_associated'] != 1) {
@@ -131,7 +132,8 @@ unset($_REQUEST['parent_id']);
                     }
                 }
             }
-        $count = (I('oa_associated') || !is_null(I('oa_associated') )) ? D(self::model_name)->where($map)->count() : D(self::model_name)->count();
+        }
+        $count = (I('oa_associated',-1) != -1) ? D(self::model_name)->where($map)->count() : D(self::model_name)->count();
         $page = set_pagination($count,$row);
         if($page) {$this->assign('_page', $page);}
         $this->assign('list_data', $list_data);