周海龙 / globalso · 提交

转到一个项目

作者 liyuhang
提交 d62e35bb27bf3b0573359bc252d300cd542d5d08 1 个父辈 12aa372a

gx

内嵌 并排对比
正在显示 5 个修改的文件 包含 22 行增加 和 16 行删除
... ... @@ -49,7 +49,7 @@ class BlogCategoryController extends BaseController
public function add(BlogCategoryRequest $request,BlogCategoryModel $blogCategoryModel,BlogModel $blogModel){
$request->validated();
$this->param['project_id'] = $this->user['project_id'];
$this->param['Operator_id'] = $this->uid;
$this->param['operator_id'] = $this->uid;
$this->param['create_id'] = $this->uid;
DB::beginTransaction();
$rs = $blogCategoryModel->add($this->param);
... ... @@ -91,7 +91,7 @@ class BlogCategoryController extends BaseController
],[
'id.required' => 'ID不能为空'
]);
$this->param['Operator_id'] = $this->uid;
$this->param['operator_id'] = $this->uid;
$rs = $blogCategoryModel->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
... ... @@ -112,7 +112,7 @@ class BlogCategoryController extends BaseController
],[
'id.required' => 'ID不能为空',
]);
$this->param['Operator_id'] = $this->uid;
$this->param['operator_id'] = $this->uid;
$rs = $blogCategoryModel->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
... ...
... ... @@ -50,7 +50,7 @@ class BlogController extends BaseController
public function add(BlogRequest $request,BlogModel $blogModel){
$request->validated();
$this->param['create_id'] = $this->uid;
$this->param['Operator_id'] = $this->uid;
$this->param['operator_id'] = $this->uid;
$this->param['project_id'] = $this->user['project_id'];
//TODO::路由映射
$rs = $blogModel->add($this->param);
... ... @@ -95,7 +95,7 @@ class BlogController extends BaseController
],[
'id.required' => 'ID不能为空',
]);
$this->param['Operator_id'] = $this->uid;
$this->param['operator_id'] = $this->uid;
$rs = $blogModel->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
... ...
... ... @@ -20,7 +20,7 @@ class NewsCategoryController extends BaseController
*/
public function lists(NewsCategoryModel $newsCategory){
//搜索条件
$lists = $newsCategory->lists($this->map,$this->page,$this->row);
$lists = $newsCategory->lists($this->map,$this->page,$this->row,$this->order);
$this->response('success',Code::SUCCESS,$lists);
}
... ... @@ -51,7 +51,7 @@ class NewsCategoryController extends BaseController
public function add(NewsCategoryRequest $request,NewsCategoryModel $newsCategoryModel,NewsModel $newsModel){
$request->validated();
$this->param['project_id'] = $this->user['project_id'];
$this->param['Operator_id'] = $this->uid;
$this->param['operator_id'] = $this->uid;
$this->param['create_id'] = $this->uid;
DB::beginTransaction();
$rs = $newsCategoryModel->add($this->param);
... ... @@ -93,7 +93,7 @@ class NewsCategoryController extends BaseController
],[
'id.required' => 'ID不能为空'
]);
$this->param['Operator_id'] = $this->uid;
$this->param['operator_id'] = $this->uid;
$rs = $newsCategory->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
... ... @@ -114,7 +114,7 @@ class NewsCategoryController extends BaseController
],[
'id.required' => 'ID不能为空',
]);
$this->param['Operator_id'] = $this->uid;
$this->param['operator_id'] = $this->uid;
$rs = $newsCategory->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
... ...
... ... @@ -9,6 +9,9 @@ use App\Models\News\News as NewsModel;
use App\Models\News\NewsCategory as NewsCategoryModel;
use Illuminate\Http\Request;
/**
* @name：新闻管理
*/
class NewsController extends BaseController
{
/**
... ... @@ -18,6 +21,7 @@ class NewsController extends BaseController
* @method
*/
public function lists(NewsModel $news){
$this->map['project_id'] = $this->user['project_id'];
$lists = $news->lists($this->map,$this->page,$this->row,$this->order);
$this->response('success',Code::SUCCESS,$lists);
}
... ... @@ -29,6 +33,8 @@ class NewsController extends BaseController
* @method
*/
public function get_category_list(NewsCategoryModel $newsCategoryModel){
$this->map['status'] = 0;
$this->map['project_id'] = $this->user['project_id'];
$cate_list = $newsCategoryModel->list($this->map,'sort');
if($cate_list === false){
$this->response('error',Code::USER_ERROR);
... ... @@ -41,7 +47,7 @@ class NewsController extends BaseController
$list[] = $v;
}
}
$this->response('当前用户菜单列表',Code::SUCCESS,$list);
$this->response('success',Code::SUCCESS,$list);
}
/**
* @name :获取详情
... ... @@ -71,7 +77,7 @@ class NewsController extends BaseController
public function add(NewsRequest $newsRequest,NewsModel $news){
$newsRequest->validated();
$this->param['create_id'] = $this->uid;
$this->param['Operator_id'] = $this->uid;
$this->param['operator_id'] = $this->uid;
$this->param['project_id'] = $this->user['project_id'];
//TODO::路由映射
$rs = $news->add($this->param);
... ... @@ -94,7 +100,7 @@ class NewsController extends BaseController
],[
'id.required' => 'ID不能为空',
]);
$this->param['Operator_id'] = $this->uid;
$this->param['operator_id'] = $this->uid;
$rs = $news->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
... ... @@ -115,7 +121,7 @@ class NewsController extends BaseController
],[
'id.required' => 'ID不能为空',
]);
$this->param['Operator_id'] = $this->uid;
$this->param['operator_id'] = $this->uid;
$rs = $news->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
... ... @@ -135,8 +141,8 @@ class NewsController extends BaseController
],[
'id.required' => 'ID不能为空',
]);
$this->param['id'] = ['in',$this->param['id']];
$rs = $news->edit(['status'=>2],$this->param);
$this->param['id'] = ['in',$this->param['id']];d;
$rs = $news->edit(['status'=>2,'operator_id'=>$this->uid],$this->param);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
... ...
... ... @@ -47,10 +47,10 @@ Route::middleware(['bloginauth'])->group(function () {
//新闻相关路由
Route::prefix('news')->group(function () {
//分类
Route::any('/category/', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'lists'])->name('news_category_lists');
Route::any('/category/add', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'add'])->name('news_category_add');
Route::any('/category/info', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'info'])->name('news_category_info');
Route::any('/category/edit', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'edit'])->name('news_category_edit');
Route::any('/category/lists', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'lists'])->name('news_category_lists');
Route::any('/category/del', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'del'])->name('news_category_del');
Route::any('/category/status', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'status'])->name('news_category_status');
... ...