发布测试版2.3.3
This commit is contained in:
@@ -318,6 +318,13 @@ class FieldController extends DefaultController
|
||||
// 写入模型数据
|
||||
$gets['setting'] = json_encode($gets['setting'], JSON_UNESCAPED_UNICODE);
|
||||
|
||||
// 去掉关联字段
|
||||
if (empty($gets['data_type'])) {
|
||||
$gets['data_type'] = '';
|
||||
$gets['data_field'] = '';
|
||||
$gets['data_link'] = '';
|
||||
}
|
||||
|
||||
$model = Field::findOrNew((int)$gets['id']);
|
||||
$model->fill($gets);
|
||||
$model->save();
|
||||
|
||||
@@ -23,7 +23,7 @@ class TodoController extends DefaultController
|
||||
->leftJoin('user as run_log_user', 'run_log_user.id', '=', 'model_run_log.created_id')
|
||||
->leftJoin('customer', 'customer.id', '=', DB::raw("model_run.partner_id and model_run.partner_type = 'customer'"))
|
||||
->leftJoin('supplier', 'supplier.id', '=', DB::raw("model_run.partner_id and model_run.partner_type = 'supplier'"))
|
||||
->where('model_run_log.updated_id', 0)
|
||||
->where('model_run_log.status', 0)
|
||||
->where('model_run_log.user_id', auth()->id())
|
||||
->orderBy('model_run.id', 'desc')
|
||||
->selectRaw("
|
||||
|
||||
Reference in New Issue
Block a user