Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -102,8 +102,8 @@ class ProofreadingController extends BaseController
             'updated_at'=>date('Y-m-d H:i:s')
             'updated_at'=>date('Y-m-d H:i:s')
         ];
         ];
         $proofreadingModel = new Proofreading();
         $proofreadingModel = new Proofreading();
-//        DB::beginTransaction();
-//        try {
+        DB::beginTransaction();
+        try {
             $proofreadingModel->del($param);
             $proofreadingModel->del($param);
             //删除成功后，重新添加
             //删除成功后，重新添加
             $save_data = [];
             $save_data = [];
@@ -113,11 +113,11 @@ class ProofreadingController extends BaseController
                 $save_data[] = $param;
                 $save_data[] = $param;
             }
             }
             $proofreadingModel->insert($save_data);
             $proofreadingModel->insert($save_data);
-//            DB::commit();
-//        }catch (\Exception $e){
-//            DB::rollBack();
-//            $this->fail('系统错误请联系管理员');
-//        }
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('系统错误请联系管理员');
+        }
         $this->response('success');
         $this->response('success');
     }
     }
 
 
@@ -162,15 +162,15 @@ class ProofreadingController extends BaseController
         $textContentArray = array_filter($matches[1], function($item) {
         $textContentArray = array_filter($matches[1], function($item) {
             return !empty(trim($item));
             return !empty(trim($item));
         });
         });
-        $textContentArray = array_values($textContentArray);
-        $uniqueArray = array_unique($textContentArray);
-        $textContentArray = array_values($uniqueArray);
         $data = [];
         $data = [];
         foreach ($textContentArray as $v){
         foreach ($textContentArray as $v){
             $content = trim($v);
             $content = trim($v);
             $trimmedString = preg_replace('/\s+/', ' ', $content);
             $trimmedString = preg_replace('/\s+/', ' ', $content);
             $data[] = $trimmedString;
             $data[] = $trimmedString;
         }
         }
+        $data = array_values($data);
+        $uniqueArray = array_unique($data);
+        $data = array_values($uniqueArray);
         return $data;
         return $data;
     }
     }