|
@@ -53,9 +53,13 @@ class CustomFieldController extends Controller
|
|
$nameRuleGroups=NamingRule::query()->get()->pluck('id')->toArray();
|
|
$nameRuleGroups=NamingRule::query()->get()->pluck('id')->toArray();
|
|
$allGroups=config("custom-field.groups");
|
|
$allGroups=config("custom-field.groups");
|
|
|
|
|
|
-
|
|
|
|
if(!empty($nameRuleGroups)){
|
|
if(!empty($nameRuleGroups)){
|
|
- $notNameRule=collect(array_diff($allGroups,$nameRuleGroups))->toArray();
|
|
|
|
|
|
+ $notNameRule = [];
|
|
|
|
+ foreach ($allGroups as $group) {
|
|
|
|
+ if (!in_array($group, $nameRuleGroups)) {
|
|
|
|
+ $notNameRule[] = $group;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
return $this->success([
|
|
return $this->success([
|
|
'data' => $notNameRule
|
|
'data' => $notNameRule
|
|
]);
|
|
]);
|