Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/public_producer

app/JsonRpc/PublicRpcService.php

@@ -1212,14 +1212,14 @@ class PublicRpcService implements PublicRpcServiceInterface
         // $sector = [];
         $sector_component = [];
         foreach ($sort as $key => $subArray) {
-        //     foreach ($subArray as $k => $item) {
+            foreach ($subArray as $k => $item) {
         //         // $component[] = $item;
                 $sector_component[] = [
                     'sector_id' => $data['sector_id'],
-                    'component_id' => $subArray[0],
+                    'component_id' => $subArray[$k],
                     'sort_id' => $key + 1,
                     'place_id' => $data['place_type'],
-                    'sectorid' => $sector,
+                    // 'sectorid' => $data['id'],
                 ];
         //         //  // ---------同步通栏的sort_id到组件之中，目前已废弃，涉及到批量修改------
         //         // $componentTypes[] = $item;
@@ -1228,14 +1228,14 @@ class PublicRpcService implements PublicRpcServiceInterface
         //         //     'component_type' => $item,
         //         // ];
         //         // $place_ids[] = $data['place_type'];
-        //     }
+            }
         }
         // $component_num = count($component);
         // $count = count(array_unique($component));
 
         // 使用array_map批量替换sector_id
        
-        // return Result::success($updatedArray);
+        // return Result::success($sector_component);
         if(count($sort) != $data['component_num']){
             return Result::error('组件关联错误！');
         }
@@ -1261,6 +1261,8 @@ class PublicRpcService implements PublicRpcServiceInterface
                 $item['sectorid'] = $sector;
                 return $item;
             }, $sector_component);
+            // Db::rollBack();
+            // return Result::success($sector_com);
             $com_sector = SectorComponent::insert($sector_com);
             if(empty($com_sector)){
                 Db::rollBack();
@@ -1366,14 +1368,14 @@ class PublicRpcService implements PublicRpcServiceInterface
         $sort = json_decode($data['component_code'],true);
         $sector_component = [];
         foreach ($sort as $key => $subArray) {
-            //     foreach ($subArray as $k => $item) {
+                foreach ($subArray as $k => $item) {
             //         // $component[] = $item;
                     $sector_component[] = [
                         'sector_id' => $data['sector_id'],
-                        'component_id' => $subArray[0],
+                        'component_id' => $subArray[$k],
                         'sort_id' => $key + 1,
                         'place_id' => $data['place_type'],
-                        'sectorid' => $sector,
+                        'sectorid' => $data['id'],
                     ];
             //         //  // ---------同步通栏的sort_id到组件之中，目前已废弃，涉及到批量修改------
             //         // $componentTypes[] = $item;
@@ -1382,7 +1384,7 @@ class PublicRpcService implements PublicRpcServiceInterface
             //         //     'component_type' => $item,
             //         // ];
             //         // $place_ids[] = $data['place_type'];
-            //     }
+                }
         }
         if(count($sort) != $data['component_num']){
             return Result::error('组件关联错误！');
@@ -1390,12 +1392,12 @@ class PublicRpcService implements PublicRpcServiceInterface
         $data['sector_code'] = json_encode($sector_code);
         Db::beginTransaction();
         try {
-            $com_sector = SectorComponent::where('sector_id', $sector['sector_id'])->pluck('component_id');
+            $com_sector = SectorComponent::where('sectorid', $data['id'])->pluck('component_id');
             if(empty($com_sector)){
                 Db::rollBack();
                 return Result::error('通栏解除组件关联失败！');
             }
-            $del_SectorComponent = SectorComponent::where('sector_id', $sector['sector_id'])->delete();
+            $del_SectorComponent = SectorComponent::where('sectorid', $data['id'])->delete();
             if(empty($del_SectorComponent)){
                 Db::rollBack();
                 return Result::error('通栏解除组件关联失败！1');
@@ -1410,6 +1412,7 @@ class PublicRpcService implements PublicRpcServiceInterface
                 $item['sectorid'] =  $data['id'];
                 return $item;
             }, $sector_component);
+            // var_dump($sector_com);
             $com_sector = SectorComponent::insert($sector_com);
             if(empty($com_sector)){
                 Db::rollBack();
@@ -2639,10 +2642,12 @@ class PublicRpcService implements PublicRpcServiceInterface
             $sector_id['sector.sector_id'] = $data['sector_id'];
             $sector['sector_component.sort_id'] = $data['sort_id'];
             $sectors = Sector::where($sector_id)
-            ->leftJoin('sector_component','sector.sector_id','sector_component.sector_id')
+            ->where('sector.template_id',$data['template_id'])
+            ->leftJoin('sector_component','sector.id','sector_component.sectorid')
             ->where($sector)
             ->select('sector.template_id','sector_component.component_id')
             ->get()->all();
+            // return Result::success($sectors);
             $component_id = array_column($sectors,'component_id');
             $template = ['template_id' => $sectors[0]['template_id']];
             $component = ComponentImg::whereIn('component_id',$component_id)