|
|
@@ -285,8 +285,8 @@ class KqService extends Service
|
|
|
$data['order_number'] = (new OrderNoService())->createOrderNumber(KqLeave::$prefix);
|
|
|
$bool = KqLeave::where('del_time',0)
|
|
|
->where('crt_id',$user['id'])
|
|
|
- ->whereColumn('start_time', '<=', $data['end_time'])
|
|
|
- ->whereColumn('end_time', '>=', $data['start_time'])
|
|
|
+ ->where('start_time', '<=', $data['end_time'])
|
|
|
+ ->where('end_time', '>=', $data['start_time'])
|
|
|
->exists();
|
|
|
}else{
|
|
|
if(empty($data['id'])) return [false,'ID不能为空'];
|
|
|
@@ -297,8 +297,8 @@ class KqService extends Service
|
|
|
|
|
|
$bool = KqLeave::where('del_time',0)
|
|
|
->where('crt_id',$user['id'])
|
|
|
- ->whereColumn('start_time', '<=', $data['end_time'])
|
|
|
- ->whereColumn('end_time', '>=', $data['start_time'])
|
|
|
+ ->where('start_time', '<=', $data['end_time'])
|
|
|
+ ->where('end_time', '>=', $data['start_time'])
|
|
|
->where('id','<>',$data['id'])
|
|
|
->exists();
|
|
|
}
|
cqp