sandm 1 年之前
父节点
当前提交
e0af372f6b
共有 1 个文件被更改,包括 17 次插入10 次删除
  1. 17 10
      server/api/modules/v1/controllers/SurveyController.php

+ 17 - 10
server/api/modules/v1/controllers/SurveyController.php

@@ -276,6 +276,13 @@ class SurveyController extends Controller {
                 $list[$k]['policy'] = $zclist;
             }
 
+            $cengci = [];
+            foreach ($list as $value) {
+                if(!isset($cengci[$value['level']])){
+                    $cengci[$value['level']] = $value;
+                }
+            }
+            $cengci = array_values($cengci);
 
         }else{
             foreach ($survey as $key=>$value) {
@@ -415,18 +422,18 @@ class SurveyController extends Controller {
                 $list[$k]['policy'] = $zclist;
             }
 
-
-        }
-        //去重复
-        $cengci = [];
-        foreach ($list as $value) {
-            if(isset($cengci[$value['level']])){
-                unset($value['level']);
-            }else{
-                $cengci[$value['level']] = $value;
+            //去重复
+            $cengci = [];
+            foreach ($list as $value) {
+                if(isset($cengci[$value['level']])){
+                    unset($value['level']);
+                }else{
+                    $cengci[$value['level']] = $value;
+                }
             }
+            $cengci = array_values($cengci);
         }
-        $cengci = array_values($cengci);
+
 
         return ['data' => $cengci];