|
|
@@ -238,6 +238,12 @@ class WholeController extends Curd
|
|
|
if (is_array($value)) {
|
|
|
if ($value[0] === 'like' || $value[0] === 'not like') {
|
|
|
$model = $model->where($column, $value[0], "%$value[1]%");
|
|
|
+ } elseif ($column == 'json') {
|
|
|
+ $model = $model->where(function ($query) use ($value){
|
|
|
+ $query->whereJsonContains($value[0] . '->' . $value[1], intval($value[2]))
|
|
|
+ ->orWhereJsonContains($value[0] . '->' . $value[1], strval($value[2]));
|
|
|
+ });
|
|
|
+// $model = $model->whereJsonContains($value[0] . '->' . $value[1], intval($value[2]));
|
|
|
} elseif (in_array($value[0], ['>', '=', '<', '<>'])) {
|
|
|
$model = $model->where($column, $value[0], $value[1]);
|
|
|
} elseif ($value[0] == 'in' && !empty($value[1])) {
|
|
|
@@ -4617,12 +4623,12 @@ class WholeController extends Curd
|
|
|
$where['order_classify'] = $request->get('goods_classify');
|
|
|
}
|
|
|
// 场所
|
|
|
-// $premise = $request->get('premises');
|
|
|
-// if (!empty($user['join_user_dept_id']) && SysDept::where('dept_id', $user['join_user_dept_id'])->where('dept_category', '餐厅')->exists()) {
|
|
|
-// $where['json'] = ['order_config_json', 'dept', $user['join_user_dept_id']];
|
|
|
-// } else if (!empty($premise)) {
|
|
|
-// $where['json'] = ['order_config_json', 'dept', $premise];
|
|
|
-// }
|
|
|
+ $premise = $request->get('premises');
|
|
|
+ if (!empty($user['join_user_dept_id']) && SysDept::where('dept_id', $user['join_user_dept_id'])->where('dept_category', '餐厅')->exists()) {
|
|
|
+ $where['json'] = ['order_config_json', 'dept', $user['join_user_dept_id']];
|
|
|
+ } else if (!empty($premise)) {
|
|
|
+ $where['json'] = ['order_config_json', 'dept', $premise];
|
|
|
+ }
|
|
|
|
|
|
if (!empty($request->get('order_ids'))) {
|
|
|
$where['order_id'] = ['in', $request->get('order_ids')];
|
gorden