周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 1242a5ae34038a89453a530233b08ad162da7909 1 个父辈 b2ed70c0

gx

内嵌 并排对比
正在显示 6 个修改的文件 包含 23 行增加 和 10 行删除
@@ -34,7 +34,11 @@ class BlogLogic extends BaseLogic @@ -34,7 +34,11 @@ class BlogLogic extends BaseLogic
34 try { 34 try {
35 $this->param = $this->paramProcessing($this->param); 35 $this->param = $this->paramProcessing($this->param);
36 if(isset($this->param['id']) && !empty($this->param['id'])){ 36 if(isset($this->param['id']) && !empty($this->param['id'])){
37 - $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $this->param['id'], $this->user['project_id']); 37 + $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1：6.0
  38 + $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
  39 + if($is_upgrade == 0 || $six_read == 1){
  40 + $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $this->param['id'], $this->user['project_id']);
  41 + }
38 $route = $this->param['url']; 42 $route = $this->param['url'];
39 $this->edit($this->param,['id'=>$this->param['id']]); 43 $this->edit($this->param,['id'=>$this->param['id']]);
40 }else{ 44 }else{
@@ -150,6 +150,7 @@ class CustomModuleCategoryLogic extends BaseLogic @@ -150,6 +150,7 @@ class CustomModuleCategoryLogic extends BaseLogic
150 * @time :2023/12/5 10:55 150 * @time :2023/12/5 10:55
151 */ 151 */
152 public function categoryEdit(){ 152 public function categoryEdit(){
  153 +
153 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE_CATE, 154 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE_CATE,
154 $this->param['id'], $this->user['project_id']); 155 $this->param['id'], $this->user['project_id']);
155 $this->editRoute($this->param['id'],$route); 156 $this->editRoute($this->param['id'],$route);
@@ -186,9 +186,12 @@ class CustomModuleContentLogic extends BaseLogic @@ -186,9 +186,12 @@ class CustomModuleContentLogic extends BaseLogic
186 * @time :2023/12/7 15:04 186 * @time :2023/12/7 15:04
187 */ 187 */
188 public function contentEdit(){ 188 public function contentEdit(){
189 - $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE,  
190 - $this->param['id'], $this->user['project_id']);  
191 - $this->editRoute($this->param['id'],$route); 189 + $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1：6.0
  190 + $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
  191 + if($is_upgrade == 0 || $six_read == 1) {
  192 + $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE, $this->param['id'], $this->user['project_id']);
  193 + }
  194 + $this->editRoute($this->param['id'],$this->param['route']);
192 $rs = $this->model->edit($this->param,['id'=>$this->param['id']]); 195 $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
193 if($rs === false){ 196 if($rs === false){
194 $this->fail('系统错误，请连续管理员'); 197 $this->fail('系统错误，请连续管理员');
@@ -64,7 +64,11 @@ class NewsLogic extends BaseLogic @@ -64,7 +64,11 @@ class NewsLogic extends BaseLogic
64 try { 64 try {
65 $this->param = $this->paramProcessing($this->param); 65 $this->param = $this->paramProcessing($this->param);
66 if (isset($this->param['id']) && !empty($this->param['id'])) { 66 if (isset($this->param['id']) && !empty($this->param['id'])) {
67 - $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $this->param['id'], $this->user['project_id']); 67 + $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1：6.0
  68 + $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
  69 + if($is_upgrade == 0 || $six_read == 1) {
  70 + $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $this->param['id'], $this->user['project_id']);
  71 + }
68 //是否更新路由 72 //是否更新路由
69 $route = $this->param['url']; 73 $route = $this->param['url'];
70 $this->edit($this->param, ['id' => $this->param['id']]); 74 $this->edit($this->param, ['id' => $this->param['id']]);
@@ -46,7 +46,11 @@ class ProductLogic extends BaseLogic @@ -46,7 +46,11 @@ class ProductLogic extends BaseLogic
46 $this->param = $this->handleSaveParam($this->param); 46 $this->param = $this->handleSaveParam($this->param);
47 try { 47 try {
48 if(isset($this->param['id']) && !empty($this->param['id'])){ 48 if(isset($this->param['id']) && !empty($this->param['id'])){
49 - $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id'],$this->param['six_read'] ?? 1); 49 + $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1:6.0数据
  50 + $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
  51 + if($is_upgrade == 0 || $six_read == 1){
  52 + $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
  53 + }
50 $route = $this->param['route']; 54 $route = $this->param['route'];
51 $this->model->edit($this->param,['id'=>$this->param['id']]); 55 $this->model->edit($this->param,['id'=>$this->param['id']]);
52 $id = $this->param['id']; 56 $id = $this->param['id'];
@@ -111,10 +111,7 @@ class RouteMap extends Base @@ -111,10 +111,7 @@ class RouteMap extends Base
111 * @author zbj 111 * @author zbj
112 * @date 2023/4/17 112 * @date 2023/4/17
113 */ 113 */
114 - public static function setRoute($title, $source, $source_id, $project_id = 0,$is_upgrade = 0){  
115 - if($is_upgrade != 0){//5.0数据编辑路由时，直接返回路由  
116 - return $title;  
117 - } 114 + public static function setRoute($title, $source, $source_id, $project_id = 0){
118 $route = self::generateRoute($title, $source, $source_id, $project_id); 115 $route = self::generateRoute($title, $source, $source_id, $project_id);
119 if(!$route){ 116 if(!$route){
120 throw new \Exception('路由生成失败'); 117 throw new \Exception('路由生成失败');