|
@@ -5,6 +5,7 @@ namespace App\Service;
|
|
|
use App\Model\Device;
|
|
use App\Model\Device;
|
|
|
use App\Model\Employee;
|
|
use App\Model\Employee;
|
|
|
use App\Model\Item;
|
|
use App\Model\Item;
|
|
|
|
|
+use App\Model\ItemDetails;
|
|
|
use App\Model\RuleSet;
|
|
use App\Model\RuleSet;
|
|
|
use App\Model\RuleSetDetails;
|
|
use App\Model\RuleSetDetails;
|
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Facades\DB;
|
|
@@ -445,9 +446,9 @@ class RuleSetService extends Service
|
|
|
$deviceMap = []; // [设备ID => [项目ID1, 项目ID2...]]
|
|
$deviceMap = []; // [设备ID => [项目ID1, 项目ID2...]]
|
|
|
|
|
|
|
|
foreach ($details as $row) {
|
|
foreach ($details as $row) {
|
|
|
- if ($row->type == RuleSetDetails::type_one) {
|
|
|
|
|
|
|
+ if ($row->type == ItemDetails::type_one) {
|
|
|
$manMap[$row->data_id][] = $row->item_id;
|
|
$manMap[$row->data_id][] = $row->item_id;
|
|
|
- } elseif ($row->type == RuleSetDetails::type_two) {
|
|
|
|
|
|
|
+ } elseif ($row->type == ItemDetails::type_two) {
|
|
|
$deviceMap[$row->data_id][] = $row->item_id;
|
|
$deviceMap[$row->data_id][] = $row->item_id;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|