周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 6e7ba9e63bf68cf3fa9184583ddc274e733a6a33 1 个父辈 9d1d7dd1

gx

内嵌 并排对比
正在显示 3 个修改的文件 包含 13 行增加 和 10 行删除
@@ -46,13 +46,15 @@ class BlogCategoryLogic extends BaseLogic @@ -46,13 +46,15 @@ class BlogCategoryLogic extends BaseLogic
46 public function categorySave(){ 46 public function categorySave(){
47 //验证名称是否存在 47 //验证名称是否存在
48 $this->verifyParamName($this->param['name']); 48 $this->verifyParamName($this->param['name']);
49 -// DB::beginTransaction();  
50 -// try { 49 + DB::beginTransaction();
  50 + try {
51 if(isset($this->param['id']) && !empty($this->param['id'])){ 51 if(isset($this->param['id']) && !empty($this->param['id'])){
52 //验证参数是否可编辑 52 //验证参数是否可编辑
53 $this->verifyParamEdit($this->param['id'],$this->param['pid']); 53 $this->verifyParamEdit($this->param['id'],$this->param['pid']);
54 //查看路由是否更新 54 //查看路由是否更新
55 - $id = $this->editCategoryRoute($this->param['id'],$this->param['alias']); 55 + $id = $this->editCategoryRoute($this->param['id'],
  56 + isset($this->param['alias']) ?? RouteMap::setRoute(isset($this->param['alias']) ? $this->param['alias'] : $this->param['name'],
  57 + RouteMap::SOURCE_BLOG_CATE, $this->param['id'], $this->user['project_id']));
56 $this->param['operator_id'] = $this->user['id']; 58 $this->param['operator_id'] = $this->user['id'];
57 $this->edit($this->param,['id'=>$this->param['id']]); 59 $this->edit($this->param,['id'=>$this->param['id']]);
58 }else{ 60 }else{
@@ -65,11 +67,11 @@ class BlogCategoryLogic extends BaseLogic @@ -65,11 +67,11 @@ class BlogCategoryLogic extends BaseLogic
65 $route = RouteMap::setRoute(isset($this->param['alias']) ? $this->param['alias'] : $this->param['name'], 67 $route = RouteMap::setRoute(isset($this->param['alias']) ? $this->param['alias'] : $this->param['name'],
66 RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']); 68 RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']);
67 $this->edit(['alias'=>$route],['id'=>$id]); 69 $this->edit(['alias'=>$route],['id'=>$id]);
68 -// DB::commit();  
69 -// }catch (\Exception $e){  
70 -// DB::rollBack();  
71 -// $this->fail('error');  
72 -// } 70 + DB::commit();
  71 + }catch (\Exception $e){
  72 + DB::rollBack();
  73 + $this->fail('系统错误，请联系管理');
  74 + }
73 //通知更新 75 //通知更新
74 $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_BLOG_CATE, 'route'=>$route]); 76 $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_BLOG_CATE, 'route'=>$route]);
75 return $this->success(); 77 return $this->success();
@@ -67,7 +67,8 @@ class NewsCategoryLogic extends BaseLogic @@ -67,7 +67,8 @@ class NewsCategoryLogic extends BaseLogic
67 $this->verifyEditParam($this->param['id'],$this->param['pid']); 67 $this->verifyEditParam($this->param['id'],$this->param['pid']);
68 $this->param['operator_id'] = $this->user['id']; 68 $this->param['operator_id'] = $this->user['id'];
69 //查看路由是否更新 69 //查看路由是否更新
70 - $id = $this->editCategoryRoute($this->param['id'],$this->param['alias']); 70 + $id = $this->editCategoryRoute($this->param['id'],$this->param['alias'] ?? RouteMap::setRoute(isset($this->param['alias']) ? $this->param['alias'] : $this->param['name'],
  71 + RouteMap::SOURCE_NEWS_CATE, $this->param['id'], $this->user['project_id']));
71 $this->edit($this->param,['id'=>$this->param['id']]); 72 $this->edit($this->param,['id'=>$this->param['id']]);
72 }else{ 73 }else{
73 $this->param = $this->addParamProcessing($this->param); 74 $this->param = $this->addParamProcessing($this->param);
@@ -53,7 +53,7 @@ class ProductLogic extends BaseLogic @@ -53,7 +53,7 @@ class ProductLogic extends BaseLogic
53 DB::commit(); 53 DB::commit();
54 }catch (\Exception $e){ 54 }catch (\Exception $e){
55 DB::rollBack(); 55 DB::rollBack();
56 - $this->fail('保存失败'); 56 + $this->fail('系统错误请联系管理员');
57 } 57 }
58 //通知更新 58 //通知更新
59 $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_PRODUCT, 'route'=>$route]); 59 $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_PRODUCT, 'route'=>$route]);