PMCORE-3246 Improvement import validation when pmtable not contain all fields.
This commit is contained in:
@@ -311,14 +311,11 @@ class CaseList extends Model
|
|||||||
//the fields have differences between the import file and the current table
|
//the fields have differences between the import file and the current table
|
||||||
$requestData['invalidFields'] = $requestData['invalidFields'] ?? '';
|
$requestData['invalidFields'] = $requestData['invalidFields'] ?? '';
|
||||||
if ($requestData['invalidFields'] !== 'continue') {
|
if ($requestData['invalidFields'] !== 'continue') {
|
||||||
$fields = Fields::where('ADD_TAB_UID', '=', $array['tableUid'])
|
$fields = [];
|
||||||
->whereNotIn('FLD_NAME', self::$excludeColumns)
|
$columns = CaseList::formattingColumns($array['type'], $array['tableUid'], []);
|
||||||
->select('FLD_NAME')
|
foreach ($columns as $column) {
|
||||||
->get()
|
$fields[] = $column['field'];
|
||||||
->transform(function ($object) {
|
}
|
||||||
return $object->FLD_NAME;
|
|
||||||
})
|
|
||||||
->toArray();
|
|
||||||
foreach ($array['columns'] as $value) {
|
foreach ($array['columns'] as $value) {
|
||||||
if (!in_array($value['field'], $fields)) {
|
if (!in_array($value['field'], $fields)) {
|
||||||
return [
|
return [
|
||||||
|
|||||||
Reference in New Issue
Block a user