正在显示
1 个修改的文件
包含
12 行增加
和
3 行删除
| @@ -140,7 +140,7 @@ class GeoQuestionRes extends Command | @@ -140,7 +140,7 @@ class GeoQuestionRes extends Command | ||
| 140 | }else{ | 140 | }else{ |
| 141 | $geoResultModel->edit($save_data, ['id' => $geo_result['id']]); | 141 | $geoResultModel->edit($save_data, ['id' => $geo_result['id']]); |
| 142 | } | 142 | } |
| 143 | - $save_data['text'] = json_encode(FALSE == empty($data) ? $data : $result,true); | 143 | + $save_data['text'] = json_encode(!empty($data) ? $data : $result,true); |
| 144 | $geoLogModel->addReturnId($save_data); | 144 | $geoLogModel->addReturnId($save_data); |
| 145 | echo '执行结束:'.$platform.PHP_EOL; | 145 | echo '执行结束:'.$platform.PHP_EOL; |
| 146 | } | 146 | } |
| @@ -211,18 +211,27 @@ class GeoQuestionRes extends Command | @@ -211,18 +211,27 @@ class GeoQuestionRes extends Command | ||
| 211 | } | 211 | } |
| 212 | switch ($item['type']){ | 212 | switch ($item['type']){ |
| 213 | case 'paragraph': | 213 | case 'paragraph': |
| 214 | + if(isset($item['text']) && !empty($item['text'])){ | ||
| 214 | array_push($texts, $item['text']); | 215 | array_push($texts, $item['text']); |
| 216 | + } | ||
| 215 | break; | 217 | break; |
| 216 | case 'title': | 218 | case 'title': |
| 219 | + if(isset($item['text']) && !empty($item['text'])) { | ||
| 217 | array_unshift($texts, $item['text']); | 220 | array_unshift($texts, $item['text']); |
| 221 | + } | ||
| 218 | break; | 222 | break; |
| 219 | case 'list': | 223 | case 'list': |
| 220 | if(!empty($item['list'])){ | 224 | if(!empty($item['list'])){ |
| 221 | foreach ($item['list'] as $sonItem){ | 225 | foreach ($item['list'] as $sonItem){ |
| 222 | - array_push($texts, $sonItem['title']); | 226 | + if(isset($sonItem['text']) && !empty($sonItem['text'])) { |
| 223 | array_push($texts, $sonItem['text']); | 227 | array_push($texts, $sonItem['text']); |
| 224 | } | 228 | } |
| 229 | + if(isset($item['title']) && !empty($item['title'])) { | ||
| 230 | + array_push($texts, $sonItem['title']); | ||
| 225 | } | 231 | } |
| 232 | + } | ||
| 233 | + } | ||
| 234 | + break; | ||
| 226 | default: | 235 | default: |
| 227 | break; | 236 | break; |
| 228 | } | 237 | } |
| @@ -230,7 +239,7 @@ class GeoQuestionRes extends Command | @@ -230,7 +239,7 @@ class GeoQuestionRes extends Command | ||
| 230 | } | 239 | } |
| 231 | if(!empty($data['data']['reference_links']) && is_array($data['data']['reference_links'])){ | 240 | if(!empty($data['data']['reference_links']) && is_array($data['data']['reference_links'])){ |
| 232 | foreach ($data['data']['reference_links'] as $link) { | 241 | foreach ($data['data']['reference_links'] as $link) { |
| 233 | - if (!empty($link['text']) && !empty($link['link'])) { | 242 | + if (isset($link['text']) && !empty($link['text']) && isset($link['link']) && !empty($link['link'])) { |
| 234 | $result['annotations'][] = [ | 243 | $result['annotations'][] = [ |
| 235 | 'type' => 'url_citation', | 244 | 'type' => 'url_citation', |
| 236 | 'url_citation' => [ | 245 | 'url_citation' => [ |
-
请 注册 或 登录 后发表评论