周海龙 / globalso · 提交

转到一个项目

作者 Your Name
提交 4640e2ace55a5343879339c46215e372ee0918f5 2 个父辈 be84367c ef255b9a

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 5 行增加 和 3 行删除
@@ -85,6 +85,7 @@ class KeywordController extends BaseController @@ -85,6 +85,7 @@ class KeywordController extends BaseController
85 } 85 }
86 $map['route'] = ['<>','']; 86 $map['route'] = ['<>',''];
87 $map['project_id'] = $this->user['project_id']; 87 $map['project_id'] = $this->user['project_id'];
  88 + $map['deleted_at'] = null;
88 return $this->success($map); 89 return $this->success($map);
89 } 90 }
90 91
@@ -31,7 +31,8 @@ class ExtensionModuleLogic extends BaseLogic @@ -31,7 +31,8 @@ class ExtensionModuleLogic extends BaseLogic
31 * @time :2024/8/7 15:50 31 * @time :2024/8/7 15:50
32 */ 32 */
33 public function saveExtensionModule(){ 33 public function saveExtensionModule(){
34 - ProjectServer::useProject($this->map['project_id']); 34 + ProjectServer::useProject($this->param['project_id']);
  35 + unset($this->param['project_id']);
35 $this->model = new ExtensionModule(); 36 $this->model = new ExtensionModule();
36 //查看数据是否存在 37 //查看数据是否存在
37 if(isset($this->param['id']) && !empty($this->param['id'])){ 38 if(isset($this->param['id']) && !empty($this->param['id'])){
@@ -61,7 +62,8 @@ class ExtensionModuleLogic extends BaseLogic @@ -61,7 +62,8 @@ class ExtensionModuleLogic extends BaseLogic
61 * @time :2024/8/7 16:07 62 * @time :2024/8/7 16:07
62 */ 63 */
63 public function delExtensionModule(){ 64 public function delExtensionModule(){
64 - ProjectServer::useProject($this->map['project_id']); 65 + ProjectServer::useProject($this->param['project_id']);
  66 + unset($this->param['project_id']);
65 $moduleFiledModel = new ExtensionModuleField(); 67 $moduleFiledModel = new ExtensionModuleField();
66 $info = $moduleFiledModel->read(['module_id'=>$this->param['id']]); 68 $info = $moduleFiledModel->read(['module_id'=>$this->param['id']]);
67 if($info !== false){ 69 if($info !== false){
@@ -215,7 +215,6 @@ class ProductLogic extends BaseLogic @@ -215,7 +215,6 @@ class ProductLogic extends BaseLogic
215 try { 215 try {
216 if(isset($this->param['route']) && !empty($this->param['route'])){ 216 if(isset($this->param['route']) && !empty($this->param['route'])){
217 $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']); 217 $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
218 -// $this->editProductRoute($this->param['id'],$this->param['route']);  
219 } 218 }
220 $this->model->edit($this->param,['id'=>$this->param['id']]); 219 $this->model->edit($this->param,['id'=>$this->param['id']]);
221 //产品分类关联 220 //产品分类关联