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

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>419]);
+        $list = $projectModel->list(['id'=>775]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
@@ -110,7 +110,7 @@ class UpdateRoute extends Command
 //                    $tag = "-tag";
 //                    $tag = "-tag";
 //                    if ((substr($v['route'], -strlen($tag)) === $tag)) {
 //                    if ((substr($v['route'], -strlen($tag)) === $tag)) {
 //                        echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;
 //                        echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;
-////                        $route = Translate::tran($v['route'], 'en').$tag;
+//                        $route = Translate::tran($v['route'], 'en').$tag;
 //                        // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
 //                        // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
 //                        $route = trim($v['route'],'-tag');
 //                        $route = trim($v['route'],'-tag');
 //                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
 //                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);

@@ -3,16 +3,10 @@
 namespace App\Http\Controllers\Aside\Manage;
 namespace App\Http\Controllers\Aside\Manage;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
-use App\Helper\Arr;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Manage\MenuLogic;
 use App\Http\Logic\Aside\Manage\MenuLogic;
 use App\Http\Requests\Aside\Manage\MenuRequest;
 use App\Http\Requests\Aside\Manage\MenuRequest;
-use App\Models\Manage\Menu;
 use App\Rules\Ids;
 use App\Rules\Ids;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Str;
-
 /**
 /**
  * 后台菜单
  * 后台菜单
  * Class MenuController
  * Class MenuController

@@ -861,6 +861,7 @@ class ProjectLogic extends BaseLogic
                 $param['designer_mid'] = $old_id;
                 $param['designer_mid'] = $old_id;
                 $deployBuildModel = new DeployBuild();
                 $deployBuildModel = new DeployBuild();
                 $deployBuildModel->edit(['designer_mid'=>$new_id],$param);
                 $deployBuildModel->edit(['designer_mid'=>$new_id],$param);
+                break;
                 //技术助理
                 //技术助理
             case 40:
             case 40:
                 $param['tech_mid'] = $old_id;
                 $param['tech_mid'] = $old_id;
@@ -891,16 +892,19 @@ class ProjectLogic extends BaseLogic
                 $param['assist_mid'] = $old_id;
                 $param['assist_mid'] = $old_id;
                 $deployOptimizeModel = new DeployOptimize();
                 $deployOptimizeModel = new DeployOptimize();
                 $deployOptimizeModel->edit(['assist_mid'=>$new_id],$param);
                 $deployOptimizeModel->edit(['assist_mid'=>$new_id],$param);
+                break;
             case 45:
             case 45:
                 //售后技术
                 //售后技术
                 $param['tech_mid'] = $old_id;
                 $param['tech_mid'] = $old_id;
                 $deployOptimizeModel = new DeployOptimize();
                 $deployOptimizeModel = new DeployOptimize();
                 $deployOptimizeModel->edit(['tech_mid'=>$new_id],$param);
                 $deployOptimizeModel->edit(['tech_mid'=>$new_id],$param);
+                break;
             case 38:
             case 38:
                 //品控
                 //品控
                 $param['design_mid'] = $old_id;
                 $param['design_mid'] = $old_id;
                 $deployOptimizeModel = new DeployOptimize();
                 $deployOptimizeModel = new DeployOptimize();
                 $deployOptimizeModel->edit(['design_mid'=>$new_id],$param);
                 $deployOptimizeModel->edit(['design_mid'=>$new_id],$param);
+                break;
             default:
             default:
                 break;
                 break;
         }
         }