合并分支 'akun' 到 'master'

Akun



查看合并请求 !740

@@ -956,10 +956,10 @@ class ProjectUpdate extends Command
         foreach ($items as $item) {
         foreach ($items as $item) {
             $route = $this->get_url_route($item['url'] ?? '');
             $route = $this->get_url_route($item['url'] ?? '');
             if ($route) {
             if ($route) {
+                $item['name'] = $this->special2str($item['name'] ?? '');
+                try {
                     $cate = $model->read(['route' => $route], 'id');
                     $cate = $model->read(['route' => $route], 'id');
                     if (!$cate) {
                     if (!$cate) {
-                    try {
-                        $item['name'] = $this->special2str($item['name'] ?? '');
                         $cate_id = $model->addReturnId([
                         $cate_id = $model->addReturnId([
                             'project_id' => $project_id,
                             'project_id' => $project_id,
                             'module_id' => $module_id,
                             'module_id' => $module_id,
@@ -968,6 +968,12 @@ class ProjectUpdate extends Command
                             'route' => $route
                             'route' => $route
                         ]);
                         ]);
                         $this->set_map($route, RouteMap::SOURCE_MODULE_CATE, $cate_id, $project_id);
                         $this->set_map($route, RouteMap::SOURCE_MODULE_CATE, $cate_id, $project_id);
+                    } else {
+                        $model->edit([
+                            'name' => $item['name'],
+                            'original_id' => $item['id'],
+                        ], ['id' => $cate['id']]);
+                    }
                 } catch (\Exception $e) {
                 } catch (\Exception $e) {
                     echo 'date:' . date('Y-m-d H:i:s') . ', category_custom_insert error: ' . $e->getMessage() . PHP_EOL;
                     echo 'date:' . date('Y-m-d H:i:s') . ', category_custom_insert error: ' . $e->getMessage() . PHP_EOL;
                     continue;
                     continue;
@@ -975,7 +981,6 @@ class ProjectUpdate extends Command
             }
             }
         }
         }
     }
     }
-    }
 
 
     //特殊字符转换
     //特殊字符转换
     protected function special2str($str)
     protected function special2str($str)