1

app/adminapi/lists/asset/AssetLeaseLists.php

@@ -266,13 +266,10 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
         $where = [];
 //        $where[] = ['lease_end_time', '>=', $params['lease_start_time']];
         $where[] = ['a_id', '=', $params['a_id']];
-       $tswhere = "(lease_start_time <". $params['lease_end_time'].") or (lease_end_time >".$params['lease_start_time'].")";
+       $tswhere = "(lease_start_time <". $params['lease_end_time'].") or ( lease_start_time < ".$params['lease_start_time']." and lease_end_time >".$params['lease_start_time'].")";
         $assetLeaseInfo = AssetLeaseInfo::where($where)->where($tswhere)->findOrEmpty();
 
         if (!$assetLeaseInfo->isEmpty()) {
-            dump($assetLeaseInfo);
-            dump($where);
-            dump($tswhere);die;
             return ['code' => 0, 'msg' => '租赁期内有未到期的租赁信息！','data'=>$assetLeaseInfo];
         }
 
@@ -322,7 +319,8 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
 //            $where[] = ['lease_end_time', '>=', $params['lease_start_time']];
             $where[] = ['id', '<>', $params['id']];
             $where[] = ['a_id', '=', $params['a_id']];
-            $tswhere = "(lease_start_time <". $params['lease_end_time'].") or (lease_end_time >".$params['lease_start_time'].")";
+//            $tswhere = "(lease_start_time <". $params['lease_end_time'].") or (lease_end_time >".$params['lease_start_time'].")";
+            $tswhere = "(lease_start_time <". $params['lease_end_time'].") or ( lease_start_time < ".$params['lease_start_time']." and lease_end_time >".$params['lease_start_time'].")";
             $assetLeaseInfo = AssetLeaseInfo::where($where)->where($tswhere)->findOrEmpty();
 
             if (!$assetLeaseInfo->isEmpty()) {