Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into master-lyh-edit

@@ -143,10 +143,6 @@ class HrLogic extends BaseLogic
                 $user->type = User::TYPE_ONE;
                 $user->type = User::TYPE_ONE;
                 $user->role_id = 38; //技术总部
                 $user->role_id = 38; //技术总部
                 $user->save();
                 $user->save();
-            }else{
-                $user->mobile = $mobile;
-                $user->name = $name;
-                $user->save();
             }
             }
         }else{
         }else{
             //离职
             //离职

@@ -141,9 +141,8 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/8/30 11:57
      * @time   :2023/8/30 11:57
      */
      */
     public function projectSave(){
     public function projectSave(){
-        DB::beginTransaction();
-        try {
-//            $this->param['project_location'] = 0;//TODO::图片文件存储不同地方，上线后删除
+//        DB::beginTransaction();
+//        try {
             if($this->param['type'] == Project::TYPE_SEVEN){
             if($this->param['type'] == Project::TYPE_SEVEN){
                 //错误单直接返回,单独处理
                 //错误单直接返回,单独处理
                 $this->setTypeSevenEdit($this->param);
                 $this->setTypeSevenEdit($this->param);
@@ -164,11 +163,11 @@ class ProjectLogic extends BaseLogic
                 $this->syncImageFile($this->param['project_location'],$this->param['id']);
                 $this->syncImageFile($this->param['project_location'],$this->param['id']);
                 (new SyncService())->projectAcceptAddress($this->param['id']);
                 (new SyncService())->projectAcceptAddress($this->param['id']);
             }
             }
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('保存失败，请联系管理员');
-        }
+//            DB::commit();
+//        }catch (\Exception $e){
+//            DB::rollBack();
+//            $this->fail('保存失败，请联系管理员');
+//        }
         return $this->success();
         return $this->success();
     }
     }
 
 
@@ -187,16 +186,16 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/8/30 12:14
      * @time   :2023/8/30 12:14
      */
      */
     public function saveProject($param){
     public function saveProject($param){
-        if($param['type'] == Project::TYPE_FIVE){
-            $param['extend_type'] = Project::TYPE_FIVE;
-            unset($param['type']);
-        }
         if($param['type'] == Project::TYPE_ONE){
         if($param['type'] == Project::TYPE_ONE){
             $param['serve_id'] = 9;
             $param['serve_id'] = 9;
         }
         }
         if((($param['type'] == Project::TYPE_TWO) || ($param['type'] == Project::TYPE_THREE)) && empty($param['uptime'])){
         if((($param['type'] == Project::TYPE_TWO) || ($param['type'] == Project::TYPE_THREE)) && empty($param['uptime'])){
             $param['uptime'] = date('Y-m-d H:i:s');
             $param['uptime'] = date('Y-m-d H:i:s');
         }
         }
+        if($param['type'] == Project::TYPE_FIVE){
+            $param['extend_type'] = Project::TYPE_FIVE;
+            unset($param['type']);
+        }
         if(isset($param['level']) && !empty($param['level'])){
         if(isset($param['level']) && !empty($param['level'])){
             $param['level'] = Arr::arrToSet($param['level']);
             $param['level'] = Arr::arrToSet($param['level']);
         }
         }