zm/journal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20201112

Browse Source
This commit is contained in:
wangjinlei
2020-12-02 10:30:04 +08:00
parent e5c7399e14
commit 85175bc776
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/api/controller/Journal.php
View File

@@ -48,7 +48,7 @@ class Journal extends Controller {
->field('j_journal.*,j_admin.realname realname') ->field('j_journal.*,j_admin.realname realname')
->join('j_admin','j_admin.admin_id = j_journal.editor_id','LEFT') ->join('j_admin','j_admin.admin_id = j_journal.editor_id','LEFT')
->where($where) ->where($where)
->order('j_journal.sort desc') ->order(['j_journal.sort desc','j_journal.journal_id'])
->select(); ->select();
return json(['code'=>0,'msg'=>'success','data'=>['journalList'=>$res]]); return json(['code'=>0,'msg'=>'success','data'=>['journalList'=>$res]]);
} }
@@ -57,4 +57,5 @@ class Journal extends Controller {
} }