周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 822b6e0e2301481ee7ffef40d542ed6272ccf713 2 个父辈 591e4097 e095e999

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

内嵌 并排对比
正在显示 7 个修改的文件 包含 68 行增加 和 14 行删除
... ... @@ -187,6 +187,7 @@ class OptimizeController extends BaseController
$query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
}
$query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
$query = $query->whereIn('gl_project_online_check.qa_status',1);
return $query;
}
... ...
... ... @@ -149,19 +149,18 @@ class UserLogic extends BaseLogic
{
foreach ($this->param['id'] as $id){
$info = $this->model->read(['id'=>$id],['id','role_id']);
if($info['role_id'] != 0){
$rs = $this->model->del(['id'=>$id]);
if($rs === false){
$this->fail('系统错误，请联系管理员');
}
Common::del_user_cache($this->model, $id, 'A');
}else{
if($info['role_id'] == 0) {
//查看当前项目是否有其他的超级管理员
$roleInfo = $this->model->read(['id'=>['!=',$info['id']],'role_id'=>0]);
if($roleInfo === false){
$this->fail('超级管理员不允许删除');
$roleInfo = $this->model->read(['id' => ['!=', $id], 'role_id' => 0]);
if ($roleInfo === false) {
$this->fail('唯一超级管理员，禁止删除');
}
}
$rs = $this->model->del(['id' => $id]);
if ($rs === false) {
$this->fail('系统错误，请联系管理员');
}
Common::del_user_cache($this->model, $id, 'A');
}
return $this->success();
}
... ...
... ... @@ -38,6 +38,7 @@ class BlogLogic extends BaseLogic
$route = $this->param['url'];
$this->edit($this->param,['id'=>$this->param['id']]);
}else{
$this->param['sort'] = $this->setNewsSort();
$id = $this->model->addReturnId($this->param);
$route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
$this->edit(['url'=>$route],['id'=>$id]);
... ... @@ -53,6 +54,22 @@ class BlogLogic extends BaseLogic
}
/**
* @remark :设置最新产品的sort排序
* @name :setNewsSort
* @author :lyh
* @method :post
* @time :2023/12/25 9:27
*/
public function setNewsSort(){
$info = $this->model->orderBy('sort','desc')->first();
if(empty($info)){
return 1;
}
$sort = $info['sort']+1;
return $sort;
}
/**
* @name :编辑seo
* @return void
* @author :liyuhang
... ...
... ... @@ -149,6 +149,7 @@ class CustomModuleContentLogic extends BaseLogic
*/
public function contentAdd(){
try {
$this->param['sort'] = $this->setNewsSort();
$id = $this->model->addReturnId($this->param);
$route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE,
$id, $this->user['project_id']);
... ... @@ -162,6 +163,22 @@ class CustomModuleContentLogic extends BaseLogic
}
/**
* @remark :设置最新产品的sort排序
* @name :setNewsSort
* @author :lyh
* @method :post
* @time :2023/12/25 9:27
*/
public function setNewsSort(){
$info = $this->model->orderBy('sort','desc')->first();
if(empty($info)){
return 1;
}
$sort = $info['sort']+1;
return $sort;
}
/**
* @remark :编辑数据
* @name :contentEdit
* @author :lyh
... ... @@ -274,7 +291,7 @@ class CustomModuleContentLogic extends BaseLogic
$v['values'] = json_encode($v['values']);
}elseif ($v['type'] == 4){
foreach ($v['values'] as $k1=>$v1){
$v1 = str_replace_url($v1);
$v1['url'] = str_replace_url($v1['url']);
$v['values'][$k1] = $v1;
}
$v['values'] = json_encode($v['values']);
... ...
... ... @@ -68,6 +68,7 @@ class NewsLogic extends BaseLogic
$route = $this->param['url'];
$this->edit($this->param, ['id' => $this->param['id']]);
} else {
$this->param['sort'] = $this->setNewsSort();
$id = $this->model->addReturnId($this->param);
$route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
$this->edit(['url' => $route], ['id' => $id]);
... ... @@ -84,6 +85,22 @@ class NewsLogic extends BaseLogic
}
/**
* @remark :设置最新产品的sort排序
* @name :setNewsSort
* @author :lyh
* @method :post
* @time :2023/12/25 9:27
*/
public function setNewsSort(){
$info = $this->model->orderBy('sort','desc')->first();
if(empty($info)){
return 1;
}
$sort = $info['sort']+1;
return $sort;
}
/**
* @name :编辑seo
* @return void
* @author :liyuhang
... ...
... ... @@ -52,6 +52,7 @@ class ProductLogic extends BaseLogic
$id = $this->param['id'];
}else{
$this->param = $this->addHandleParam($this->param);
$this->param['sort'] = $this->setNewsSort();
$id = $this->model->addReturnId($this->param);
$route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
$this->model->edit(['route'=>$route],['id'=>$id]);
... ... @@ -77,10 +78,11 @@ class ProductLogic extends BaseLogic
*/
public function setNewsSort(){
$info = $this->model->orderBy('sort','desc')->first();
if($info === false){
if(empty($info)){
return 1;
}
return $info['sort']++;
$sort = $info['sort']+1;
return $sort;
}
/**
... ...
... ... @@ -171,6 +171,7 @@ class UserLoginLogic
$info['image_max'] = $project['image_max'];
$info['is_update_language'] = $project['is_update_language'];
$info['configuration'] = $project['deploy_build']['configuration'];
$info['project_type'] = $project['type'];
if($info['is_customized'] == 1){
$info['is_visualization'] = json_decode($project['is_visualization']);
}
... ... @@ -207,7 +208,7 @@ class UserLoginLogic
$info['image_max'] = $project['image_max'];
$info['is_update_language'] = $project['is_update_language'];
$info['configuration'] = $project['deploy_build']['configuration'];
$info['type'] = $project['type'];
$info['project_type'] = $project['type'];
if($info['is_customized'] == 1){
$info['is_visualization'] = json_decode($project['is_visualization']);
}
... ...