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

@@ -79,7 +79,7 @@ class ReplaceHtml extends Command
         $saveData = [];
         $saveData = [];
         $bTemplateModel = new BTemplate();
         $bTemplateModel = new BTemplate();
         $condition = ['source'=>$info['source'],'template_id'=>$info['template_id'],'is_custom'=>$info['is_custom'],'is_list'=>$info['is_list']];
         $condition = ['source'=>$info['source'],'template_id'=>$info['template_id'],'is_custom'=>$info['is_custom'],'is_list'=>$info['is_list']];
-        $bTemplateList = $bTemplateModel->list($condition,'id',['id']);
+        $bTemplateList = $bTemplateModel->list($condition,'id',['id','source_id']);
         foreach ($bTemplateList as $v){
         foreach ($bTemplateList as $v){
             $saveData[] = [
             $saveData[] = [
                 'replace_id'=>$info['id'],
                 'replace_id'=>$info['id'],
@@ -88,7 +88,7 @@ class ReplaceHtml extends Command
                 'old_html'=>$info['old_html'],
                 'old_html'=>$info['old_html'],
                 'html'=>$info['html'],
                 'html'=>$info['html'],
                 'source'=>$info['source'],
                 'source'=>$info['source'],
-                'source_id'=>$v['id'],
+                'source_id'=>$info['source'] == 1 ? 0 : $v['source_id'],
                 'is_custom'=>$info['is_custom'],
                 'is_custom'=>$info['is_custom'],
                 'is_list'=>$info['is_list'],
                 'is_list'=>$info['is_list'],
                 'is_rollback'=>$info['is_rollback'],
                 'is_rollback'=>$info['is_rollback'],

@@ -78,6 +78,7 @@ class ReplaceHtmlLog extends Command
      * @time   :2024/5/10 17:56
      * @time   :2024/5/10 17:56
      */
      */
     public function replaceHtml($info){
     public function replaceHtml($info){
+        $source_id = $info['source'] == 1 ? 0 : $info['source_id'];
         $bTemplateModel = new BTemplate();
         $bTemplateModel = new BTemplate();
         $condition = ['source'=>$info['source'],'source_id'=>$info['source_id'],
         $condition = ['source'=>$info['source'],'source_id'=>$info['source_id'],
             'template_id'=>$info['template_id'],'is_custom'=>$info['is_custom'],'is_list'=>$info['is_list']];
             'template_id'=>$info['template_id'],'is_custom'=>$info['is_custom'],'is_list'=>$info['is_list']];

@@ -15,6 +15,7 @@ use App\Models\ASide\APublicModel;
 use App\Models\Channel\Channel;
 use App\Models\Channel\Channel;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Manage\Manage;
 use App\Models\Manage\Manage;
+use App\Models\Manage\ManageHr;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Task\Task;
 use App\Models\Task\Task;
@@ -100,7 +101,7 @@ class OnlineController extends BaseController
         if($item['type'] != Project::TYPE_ZERO){
         if($item['type'] != Project::TYPE_ZERO){
             $data = APublicModel::getNumByProjectId($item['id']);
             $data = APublicModel::getNumByProjectId($item['id']);
         }
         }
-        $manageModel = new Manage();
+        $manageModel = new ManageHr();
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $item['build_leader'] = $manageModel->getName($item['leader_mid']);
         $item['build_leader'] = $manageModel->getName($item['leader_mid']);
         $item['build_manager'] = $manageModel->getName($item['manager_mid']);
         $item['build_manager'] = $manageModel->getName($item['manager_mid']);

@@ -11,6 +11,7 @@ use App\Rules\Ids;
 use App\Services\BatchExportService;
 use App\Services\BatchExportService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 
 /**
 /**
  * 精准询盘
  * 精准询盘
@@ -131,6 +132,12 @@ class InquiryController extends BaseController
             if(!empty($this->param['form_id'])){
             if(!empty($this->param['form_id'])){
                 $item = array_merge($item, $item['data']);
                 $item = array_merge($item, $item['data']);
             }
             }
+
+            foreach ($map as $field => $name) {
+                if (Str::startsWith($item[$field], '=')) {
+                    $item[$field] = "'" . $item[$field];
+                }
+            }
         }
         }
 
 
         //生成文件，发送到客户端
         //生成文件，发送到客户端

@@ -143,7 +143,7 @@ class ReplaceHtmlLogic extends BaseLogic
             $total_num = $bTemplateModel->formatQuery($condition)->count();
             $total_num = $bTemplateModel->formatQuery($condition)->count();
         }
         }
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
-        $replaceId = $this->saveReplaceHtml($this->param,$typeInfo,$template_id,$total_num);
+        $replaceId = $this->saveReplaceHtml($this->param,$typeInfo,$template_id,$total_num ?? 0);
         return $this->success(['id'=>$replaceId]);
         return $this->success(['id'=>$replaceId]);
     }
     }
 
 
@@ -216,6 +216,7 @@ class ReplaceHtmlLogic extends BaseLogic
             'project_id'=>$info['project_id'],
             'project_id'=>$info['project_id'],
             'is_rollback'=>1,
             'is_rollback'=>1,
             'rollback_id'=>$info['id'],
             'rollback_id'=>$info['id'],
+            'total_num'=>$info['total_num'],
             'operator_id'=>$this->manager['id']
             'operator_id'=>$this->manager['id']
         ];
         ];
         return $this->model->addReturnId($logData);
         return $this->model->addReturnId($logData);