Browse Source

完善功能

gorden 10 months ago
parent
commit
0ade28855f

+ 10 - 0
app/admin/controller/asset/HouseTypeController.php

@@ -7,6 +7,7 @@ use app\controller\Curd;
 use app\model\Asset;
 use support\exception\BusinessException;
 use support\Request;
+use support\Response;
 
 class HouseTypeController extends Curd
 {
@@ -17,6 +18,15 @@ class HouseTypeController extends Curd
         $this->validateClass = new HouseTypeValidate();
     }
 
+    public function select(Request $request): Response
+    {
+        [$where, $format, $limit, $field, $order] = $this->selectInput($request);
+        $order = $request->get('order', 'desc');
+        $field = $field ?? 'asset_addtimes';
+        $query = $this->doSelect($where, $field, $order);
+        return $this->doFormat($query, $format, $limit);
+    }
+
     public function afterQuery($items)
     {
         foreach ($items as &$item) {

+ 1 - 1
app/admin/controller/sys_manage/AdvController.php

@@ -31,7 +31,7 @@ class AdvController extends Curd
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $where['adv_category'] = 'adv';
         $order = $request->get('order', 'desc');
-        $field = $field ?? 'content_sort';
+        $field = $field ?? 'content_addtimes';
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }

+ 1 - 1
app/admin/service/member/MemberService.php

@@ -140,7 +140,7 @@ class MemberService
             })
             ->when(empty($familyMemberIds), function ($query) use ($id) {
                 $query->where('member_device.join_device_master_member_id', $id);
-            })
+            })->orderBy('member_device_addtimes','desc')
             ->get()
             ->toArray();