Merge branch 'master' of http://114.215.101.231:8099/outsource/signUpForCar

@@ -137,6 +137,7 @@ class CommentController extends AdminBaseController
         $list = DB::name($this->table_name)
         $list = DB::name($this->table_name)
             ->alias('c')
             ->alias('c')
             ->join('qnb_user u','u.id=c.teach_id')
             ->join('qnb_user u','u.id=c.teach_id')
+            ->order('create_time desc')
             ->field('c.*')
             ->field('c.*')
             ->where($where)
             ->where($where)
             ->paginate(15);
             ->paginate(15);
@@ -175,6 +176,7 @@ class CommentController extends AdminBaseController
             ->alias('c')
             ->alias('c')
             ->join('qnb_user u','u.id=c.uid')
             ->join('qnb_user u','u.id=c.uid')
             ->field('c.*')
             ->field('c.*')
+            ->order('create_time desc')
             ->where(['c.delete_time'=>0])
             ->where(['c.delete_time'=>0])
             ->paginate(15);
             ->paginate(15);
 
 

@@ -95,7 +95,7 @@ class YuyueController extends UserBaseController
         $rre   = Db::name('commente')
         $rre   = Db::name('commente')
             ->alias('c')
             ->alias('c')
             ->join('qnb_user u', 'u.id = c.uid')
             ->join('qnb_user u', 'u.id = c.uid')
-            ->where(['teach_id' => $id])
+            ->where(['teach_id' => $id,'comment'=>['neq','']])
             ->field('c.*,u.user_nickname')
             ->field('c.*,u.user_nickname')
             ->select()
             ->select()
             ->toarray();
             ->toarray();
@@ -220,7 +220,7 @@ class YuyueController extends UserBaseController
         $rre   = Db::name('commente')
         $rre   = Db::name('commente')
             ->alias('c')
             ->alias('c')
             ->join('qnb_user u', 'u.id = c.uid')
             ->join('qnb_user u', 'u.id = c.uid')
-            ->where(['teach_id' => $id])
+            ->where(['teach_id' => $id,'comment'=>['neq','']])
             ->field('c.*,u.user_nickname')
             ->field('c.*,u.user_nickname')
             ->select()
             ->select()
             ->toarray();
             ->toarray();

@@ -155,7 +155,6 @@
             <noempty name="pcdata">
             <noempty name="pcdata">
                 <option value='{$pcdata.id}' checked>{$pcdata.user_nickname}</option>
                 <option value='{$pcdata.id}' checked>{$pcdata.user_nickname}</option>
             </noempty>
             </noempty>
-            <option value='-1'>全部</option>
             <foreach name="cdata" id="vo">
             <foreach name="cdata" id="vo">
                 <option value='{$vo.id}'>{$vo.user_nickname}</option>
                 <option value='{$vo.id}'>{$vo.user_nickname}</option>
             </foreach>
             </foreach>