|
|
|
@ -74,7 +74,7 @@ class PlanListController extends Controller
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!empty($searchInfo['device_id'])) {
|
|
|
|
if (!empty($searchInfo['device_id'])) {
|
|
|
|
//$list = $list->where('s_source_roster_detail.device_id', 'like','%,'.$searchInfo['device_id'].',%' );
|
|
|
|
//$list = $list->where('s_source_roster_detail.device_id', 'like','%,'.$searchInfo['device_id'].',%' );
|
|
|
|
$list = $list->whereRaw("FIND_IN_SET({$searchInfo['device_id']}, s_source_roster_detail.device_id)");
|
|
|
|
$list = $list->whereRaw("FIND_IN_SET(?, s_source_roster_detail.device_id)", [$searchInfo['device_id']]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!empty($searchInfo['xingqi'])) {
|
|
|
|
if (!empty($searchInfo['xingqi'])) {
|
|
|
|
$list = $list->where('s_source_roster_detail.weekname', $searchInfo['xingqi']);
|
|
|
|
$list = $list->where('s_source_roster_detail.weekname', $searchInfo['xingqi']);
|
|
|
|
|