1

app/adminapi/lists/asset/AssetLeaseLists.php

@@ -87,10 +87,12 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
                     $where[] = ['approval_status', '=', $parms['approval_status']];
                 }
             }
+
             if(isset($parms['expiration_flag'])) {
                 $expiration_date = date('Y-m-d',strtotime(time() . '+30 day'));//购买过后的到期时间 $size
                 if ($parms['expiration_flag']) {
-                    $where[] = ['lease_end_time', '<=', $expiration_date];
+//                    $where[] = ['lease_end_time', '<=', $expiration_date];
+                    $where[] = ['approval_status','=','5'];
                 }
             }
 
@@ -191,11 +193,12 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
             if(isset($parms['expiration_flag'])) {
                 $expiration_date = date('Y-m-d',strtotime(time() . '+30 day'));//购买过后的到期时间 $size
                 if ($parms['expiration_flag']) {
-                    $where[] = ['lease_end_time', '<=', $expiration_date];
+//                    $where[] = ['lease_end_time', '<=', $expiration_date];
                     $where[] = ['approval_status','=','5'];
                 }
             }
 
+
         }
 
         if(!$admin_info['root']) {
@@ -230,6 +233,7 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
                 }
             }
         }
+
         return (new AssetLeaseInfo())->where($this->searchWhere)->where($where)->count();
     }