|
@@ -42,9 +42,9 @@ class Journal extends Core
|
|
|
}
|
|
|
|
|
|
if ($this->app) {
|
|
|
- $where['publish'] = 2;
|
|
|
+ $where['publish'] = '0,2';
|
|
|
} else {
|
|
|
- $where['publish'] = 1;
|
|
|
+ $where['publish'] = '0,1';
|
|
|
}
|
|
|
|
|
|
$data = Dever::db('journal/info')->getAll($where);
|
|
@@ -81,11 +81,11 @@ class Journal extends Core
|
|
|
if (isset($cate['id'])) {
|
|
|
$where['cate_id'] = $cate['id'];
|
|
|
}
|
|
|
- $where['publish'] = 1;
|
|
|
+ $where['publish'] = '0,1';
|
|
|
if ($this->app) {
|
|
|
$where['cate_id_1'] = 1;
|
|
|
$where['time'] = $time - $day;
|
|
|
- $where['publish'] = 2;
|
|
|
+ $where['publish'] = '0,2';
|
|
|
|
|
|
|
|
|
$this->data['push'] = Dever::db('journal/info')->getNew($where);
|