作者 Your Name

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

@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 namespace App\Http\Controllers\Bside\Setting; 3 namespace App\Http\Controllers\Bside\Setting;
4 4
5 use App\Http\Controllers\Bside\BaseController; 5 use App\Http\Controllers\Bside\BaseController;
  6 +use App\Http\Logic\Bside\Setting\WebSettingCountryLogic;
6 7
7 class WebSettingCountryController extends BaseController 8 class WebSettingCountryController extends BaseController
8 { 9 {
@@ -12,7 +13,7 @@ class WebSettingCountryController extends BaseController @@ -12,7 +13,7 @@ class WebSettingCountryController extends BaseController
12 * @method :post 13 * @method :post
13 * @time :2023/4/28 14:40 14 * @time :2023/4/28 14:40
14 */ 15 */
15 - public function lists(){ 16 + public function lists(WebSettingCountryLogic $webSettingCountryLogic){
16 17
17 } 18 }
18 } 19 }
@@ -44,6 +44,7 @@ class WebSettingLogic extends BaseLogic @@ -44,6 +44,7 @@ class WebSettingLogic extends BaseLogic
44 //查看数据是否存在 44 //查看数据是否存在
45 $info = $this->model->read(['project_id'=>$this->user['project_id']]); 45 $info = $this->model->read(['project_id'=>$this->user['project_id']]);
46 if($info === false){ 46 if($info === false){
  47 + $this->param['operator_id'] = $this->user['id'];
47 $this->param['project_id'] = $this->user['project_id']; 48 $this->param['project_id'] = $this->user['project_id'];
48 $rs = $this->model->add($this->param); 49 $rs = $this->model->add($this->param);
49 }else{ 50 }else{
@@ -129,7 +129,7 @@ return [ @@ -129,7 +129,7 @@ return [
129 ], 129 ],
130 //操作日志 130 //操作日志
131 'operator_log' =>[ 131 'operator_log' =>[
132 - 'log'=>true,//true开启 132 + 'log'=>false,//true开启
133 'action' => [],//不需要写入日志的方法 133 'action' => [],//不需要写入日志的方法
134 ], 134 ],
135 ]; 135 ];