判断租赁时间

app/adminapi/lists/asset/AssetLeaseLists.php

@@ -264,10 +264,10 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
             return ['code' => 0, 'msg' => '租赁时间范围有误请检查！'];
         }
         $where = [];
-        $where[] = ['lease_end_time', '>=', $params['lease_start_time']];
+//        $where[] = ['lease_end_time', '>=', $params['lease_start_time']];
         $where[] = ['a_id', '=', $params['a_id']];
-
-        $assetLeaseInfo = AssetLeaseInfo::where($where)->findOrEmpty();
+       $tswhere = "(lease_start_time <". $params['lease_end_time'].") or (lease_end_time >".$params['lease_start_time'].")";
+        $assetLeaseInfo = AssetLeaseInfo::where($where)->where($tswhere)->findOrEmpty();
 
         if (!$assetLeaseInfo->isEmpty()) {
             return ['code' => 0, 'msg' => '租赁期内有未到期的租赁信息！'];
@@ -316,11 +316,11 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
                 throw new \Exception('租赁时间范围有误请检查');
             }
             $where = [];
-            $where[] = ['lease_end_time', '>=', $params['lease_start_time']];
+//            $where[] = ['lease_end_time', '>=', $params['lease_start_time']];
             $where[] = ['id', '<>', $params['id']];
             $where[] = ['a_id', '=', $params['a_id']];
-
-            $assetLeaseInfo = AssetLeaseInfo::where($where)->findOrEmpty();
+            $tswhere = "(lease_start_time <". $params['lease_end_time'].") or (lease_end_time >".$params['lease_start_time'].")";
+            $assetLeaseInfo = AssetLeaseInfo::where($where)->where($tswhere)->findOrEmpty();
 
             if (!$assetLeaseInfo->isEmpty()) {
                 throw new \Exception('租赁期内有未到期的租赁信息');