正在显示
1 个修改的文件
包含
10 行增加
和
10 行删除
| @@ -102,8 +102,8 @@ class ProofreadingController extends BaseController | @@ -102,8 +102,8 @@ class ProofreadingController extends BaseController | ||
| 102 | 'updated_at'=>date('Y-m-d H:i:s') | 102 | 'updated_at'=>date('Y-m-d H:i:s') |
| 103 | ]; | 103 | ]; |
| 104 | $proofreadingModel = new Proofreading(); | 104 | $proofreadingModel = new Proofreading(); |
| 105 | -// DB::beginTransaction(); | ||
| 106 | -// try { | 105 | + DB::beginTransaction(); |
| 106 | + try { | ||
| 107 | $proofreadingModel->del($param); | 107 | $proofreadingModel->del($param); |
| 108 | //删除成功后,重新添加 | 108 | //删除成功后,重新添加 |
| 109 | $save_data = []; | 109 | $save_data = []; |
| @@ -113,11 +113,11 @@ class ProofreadingController extends BaseController | @@ -113,11 +113,11 @@ class ProofreadingController extends BaseController | ||
| 113 | $save_data[] = $param; | 113 | $save_data[] = $param; |
| 114 | } | 114 | } |
| 115 | $proofreadingModel->insert($save_data); | 115 | $proofreadingModel->insert($save_data); |
| 116 | -// DB::commit(); | ||
| 117 | -// }catch (\Exception $e){ | ||
| 118 | -// DB::rollBack(); | ||
| 119 | -// $this->fail('系统错误请联系管理员'); | ||
| 120 | -// } | 116 | + DB::commit(); |
| 117 | + }catch (\Exception $e){ | ||
| 118 | + DB::rollBack(); | ||
| 119 | + $this->fail('系统错误请联系管理员'); | ||
| 120 | + } | ||
| 121 | $this->response('success'); | 121 | $this->response('success'); |
| 122 | } | 122 | } |
| 123 | 123 | ||
| @@ -162,15 +162,15 @@ class ProofreadingController extends BaseController | @@ -162,15 +162,15 @@ class ProofreadingController extends BaseController | ||
| 162 | $textContentArray = array_filter($matches[1], function($item) { | 162 | $textContentArray = array_filter($matches[1], function($item) { |
| 163 | return !empty(trim($item)); | 163 | return !empty(trim($item)); |
| 164 | }); | 164 | }); |
| 165 | - $textContentArray = array_values($textContentArray); | ||
| 166 | - $uniqueArray = array_unique($textContentArray); | ||
| 167 | - $textContentArray = array_values($uniqueArray); | ||
| 168 | $data = []; | 165 | $data = []; |
| 169 | foreach ($textContentArray as $v){ | 166 | foreach ($textContentArray as $v){ |
| 170 | $content = trim($v); | 167 | $content = trim($v); |
| 171 | $trimmedString = preg_replace('/\s+/', ' ', $content); | 168 | $trimmedString = preg_replace('/\s+/', ' ', $content); |
| 172 | $data[] = $trimmedString; | 169 | $data[] = $trimmedString; |
| 173 | } | 170 | } |
| 171 | + $data = array_values($data); | ||
| 172 | + $uniqueArray = array_unique($data); | ||
| 173 | + $data = array_values($uniqueArray); | ||
| 174 | return $data; | 174 | return $data; |
| 175 | } | 175 | } |
| 176 | 176 |
-
请 注册 或 登录 后发表评论