修改范围判断

app/adminapi/lists/asset/AssetLeaseLists.php

@@ -327,12 +327,22 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
             $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_start_time < ".$params['lease_start_time']." and lease_end_time >".$params['lease_start_time'].")";
-            $assetLeaseInfo = AssetLeaseInfo::where($where)->where($tswhere)->findOrEmpty();
-
-            if (!$assetLeaseInfo->isEmpty()) {
-                throw new \Exception('租赁期内有未到期的租赁信息');
-            }
+//            $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();
+			$assetLeaseInfo = AssetLeaseInfo::where($where)->select()->toArray();
+			foreach ($assetLeaseInfo as $alv){
+				$lease_start_time = strtotime($params['lease_start_time']);
+				$lease_end_time = strtotime($params['lease_end_time']);
+				$o_lease_start_time = strtotime($alv['lease_start_time']);
+				$o_lease_end_time = strtotime($alv['lease_end_time']);
+				if(($lease_start_time >= $o_lease_start_time && $lease_start_time <= $o_lease_end_time) || ($lease_end_time >= $o_lease_start_time && $lease_end_time <= $o_lease_end_time)){
+					throw new \Exception('租赁期内有未到期的租赁信息');
+					break;
+				}
+			}
+//            if (!$assetLeaseInfo->isEmpty()) {
+//				throw new \Exception('租赁期内有未到期的租赁信息');
+//            }
 
             $asset_lease_info = AssetLeaseInfo::find($params['id']);