Browse Source

:bug: ¥newPart 没有加是否存在的判断

visuddhinanda 3 years ago
parent
commit
52c02eb551
1 changed files with 11 additions and 9 deletions
  1. 11 9
      app/Console/Commands/UpgradeDict.php

+ 11 - 9
app/Console/Commands/UpgradeDict.php

@@ -80,7 +80,7 @@ class UpgradeDict extends Command
 								$tableDict->owner_id = config("app.admin.root_uuid");
 								$tableDict->owner_id = config("app.admin.root_uuid");
 								$tableDict->meta = json_encode($this->dictInfo['meta']);
 								$tableDict->meta = json_encode($this->dictInfo['meta']);
 								$tableDict->save();
 								$tableDict->save();
-								
+
 								if($this->option('part')){
 								if($this->option('part')){
 									$this->info(" dict id = ".$this->dictInfo['meta']['uuid']);
 									$this->info(" dict id = ".$this->dictInfo['meta']['uuid']);
 								}else{
 								}else{
@@ -114,7 +114,7 @@ class UpgradeDict extends Command
 														# code...
 														# code...
 														if(empty($part)){
 														if(empty($part)){
 															continue;
 															continue;
-														}		
+														}
 														if(isset($newPart[$part])){
 														if(isset($newPart[$part])){
 															$newPart[$part][0]++;
 															$newPart[$part][0]++;
 														}else{
 														}else{
@@ -127,7 +127,7 @@ class UpgradeDict extends Command
 															$this->info("{$count}:{$part}-{$word}");
 															$this->info("{$count}:{$part}-{$word}");
 															}
 															}
 														}
 														}
-														
+
 													}
 													}
 												}else{
 												}else{
 													$newDict = new UserDict();
 													$newDict = new UserDict();
@@ -147,7 +147,7 @@ class UpgradeDict extends Command
 													$newDict->create_time =(int)(microtime(true)*1000);
 													$newDict->create_time =(int)(microtime(true)*1000);
 													$newDict->creator_id = 1;
 													$newDict->creator_id = 1;
 													$newDict->dict_id = $this->dictInfo['meta']['uuid'];
 													$newDict->dict_id = $this->dictInfo['meta']['uuid'];
-													$newDict->save();											
+													$newDict->save();
 												}
 												}
 
 
 												$bar->advance();
 												$bar->advance();
@@ -160,13 +160,15 @@ class UpgradeDict extends Command
 								}
 								}
 								$bar->finish();
 								$bar->finish();
 								Storage::disk('local')->put("tmp/pm-part.csv", "part,count,word");
 								Storage::disk('local')->put("tmp/pm-part.csv", "part,count,word");
-								foreach ($newPart as $part => $info) {
-									# 写入磁盘文件
-									Storage::disk('local')->append("tmp/pm-part.csv", "{$part},{$info[0]},{$info[1]}");
-								}
+                                if(isset($newPart)){
+                                    foreach ($newPart as $part => $info) {
+                                        # 写入磁盘文件
+                                        Storage::disk('local')->append("tmp/pm-part.csv", "{$part},{$info[0]},{$info[1]}");
+                                    }
+                                }
 								$this->info("done");
 								$this->info("done");
 							}
 							}
-							
+
 						}
 						}
 					}
 					}
 				}
 				}