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

@@ -12,6 +12,7 @@ namespace App\Http\Controllers\Bside\ExtensionModule;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\ExtensionModule\ExtensionModuleFieldLogic;
 use App\Http\Logic\Bside\ExtensionModule\ExtensionModuleFieldLogic;
+use App\Models\ExtentModule\Extension2205ModuleValueLog;
 use App\Models\ExtentModule\ExtensionModule;
 use App\Models\ExtentModule\ExtensionModule;
 use App\Models\ExtentModule\ExtensionModuleField;
 use App\Models\ExtentModule\ExtensionModuleField;
 use App\Models\ExtentModule\ExtensionModuleValue;
 use App\Models\ExtentModule\ExtensionModuleValue;
@@ -211,8 +212,6 @@ class ExtensionModuleController extends BaseController
                             $number++;
                             $number++;
                         }
                         }
                         if(($status_data[$info['value']] + 1) != $status_data[$v['value']]){
                         if(($status_data[$info['value']] + 1) != $status_data[$v['value']]){
-                            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($status_data[$info['value']], true) . PHP_EOL, FILE_APPEND);
-                            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($status_data[$v['value']], true) . PHP_EOL, FILE_APPEND);
                             $this->fail('流程控制不能跳流程选择');
                             $this->fail('流程控制不能跳流程选择');
                         }
                         }
                         if($status_data[$info['value']] > $status_data[$v['value']]){
                         if($status_data[$info['value']] > $status_data[$v['value']]){
@@ -383,6 +382,10 @@ class ExtensionModuleController extends BaseController
         ]);
         ]);
         $moduleValueModel = new ExtensionModuleValue();
         $moduleValueModel = new ExtensionModuleValue();
         $moduleValueModel->del(['module_id'=>$this->param['module_id'],'uuid'=>$this->param['uuid']]);
         $moduleValueModel->del(['module_id'=>$this->param['module_id'],'uuid'=>$this->param['uuid']]);
+        if($this->user['project_id'] == 2205 && $this->param['module_id'] == 1){
+            $log2205Model = new Extension2205ModuleValueLog();
+            $log2205Model->del(['uuid'=>$this->param['uuid']]);
+        }
         $this->response('success');
         $this->response('success');
     }
     }