Merge remote-tracking branch 'origin/master' into akun

@@ -703,17 +703,17 @@ class ProjectLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @remark :保存其他配置
-     * @name   :saveOtherProject
-     * @author :lyh
-     * @method :post
-     * @time   :2023/11/17 15:26
+     * 保存其他配置
+     * AICC、hagro、token
+     * @return array
+     * @throws AsideGlobalException
+     * @throws \App\Exceptions\BsideGlobalException
      */
      */
     public function saveOtherProject(){
     public function saveOtherProject(){
         //获取当前数据详情
         //获取当前数据详情
         $projectInfo = $this->getProjectInfo($this->param['id']);
         $projectInfo = $this->getProjectInfo($this->param['id']);
-        //aicc
-        if(($projectInfo['aicc'] == Project::TYPE_ZERO) && ($this->param['aicc'] == Project::TYPE_ONE)){
+        //aicc if (($projectInfo['aicc'] == Project::TYPE_ZERO) && ($this->param['aicc'] == Project::TYPE_ONE)) 从关闭到开启状态才同步， 改成只要是开启状态就同步
+        if($this->param['aicc'] == Project::TYPE_ONE){
             $data = [
             $data = [
                 'company_name'=>$projectInfo['company'],
                 'company_name'=>$projectInfo['company'],
                 'principal_mobile'=>$projectInfo['mobile'],
                 'principal_mobile'=>$projectInfo['mobile'],
@@ -723,8 +723,8 @@ class ProjectLogic extends BaseLogic
             ];
             ];
             $this->toAicc($data);
             $this->toAicc($data);
         }
         }
-        //黑格
-        if(($projectInfo['hagro'] == Project::TYPE_ZERO) && ($this->param['hagro'] == Project::TYPE_ONE)){
+        //黑格 从关闭到开启状态才同步， 改成只要是开启状态就同步， 需要修改有效时间
+        if($this->param['hagro'] == Project::TYPE_ONE){
             $data = [
             $data = [
                 'company_name'=>$projectInfo['company'],
                 'company_name'=>$projectInfo['company'],
                 'principal_mobile'=>$projectInfo['mobile'],
                 'principal_mobile'=>$projectInfo['mobile'],