diff --git a/app/admin/controller/infoArticle/infoArticle.php b/app/admin/controller/infoArticle/infoArticle.php index 5ce65ac..be5f6d2 100644 --- a/app/admin/controller/infoArticle/infoArticle.php +++ b/app/admin/controller/infoArticle/infoArticle.php @@ -57,13 +57,7 @@ class infoArticle extends BaseController 'info_article_order|文章排序' => 'require' ]); $model = ModelinfoArticle::where('info_article_guid', $params['info_article_guid'])->find(); - - Tool::sortEditProc( - new ModelinfoArticle, - ["info_article_order" => $params['info_article_order']], - ["info_article_guid" => $params['info_article_guid']], - - ); + if (!$model) throwErrorMsg("该资讯文章不存在", 1); $model->allowField([ 'info_article_update_user_guid', @@ -87,10 +81,7 @@ class infoArticle extends BaseController 'info_article_content|文章内容' => 'require', 'info_article_order|文章排序' => 'require' ]); - Tool::sortInsertProc( - new ModelinfoArticle, - ["info_article_order" => $params['info_article_order']], - ); + $model = ModelinfoArticle::create($params, [ 'info_article_guid', 'info_article_create_user_guid', @@ -115,11 +106,7 @@ class infoArticle extends BaseController $info_article = ModelinfoArticle::where([ 'info_article_guid' => explode(',', $params['info_article_guid']) ])->select(); - Tool::sortDeleteProc( - new ModelinfoArticle, - 'info_article_order', - ["info_article_guid" => $guids], - ); + $info_article->delete(); return msg('删除成功!'); } diff --git a/app/admin/controller/infoArticleType/infoArticleType.php b/app/admin/controller/infoArticleType/infoArticleType.php index d2b3936..a193e23 100644 --- a/app/admin/controller/infoArticleType/infoArticleType.php +++ b/app/admin/controller/infoArticleType/infoArticleType.php @@ -53,12 +53,7 @@ class infoArticleType extends BaseController 'info_article_type_sort|资讯类型排序' => 'require' ]); $model = ModelinfoArticleType::where('info_article_type_guid', $params['info_article_type_guid'])->find(); - Tool::sortEditProc( - new ModelinfoArticleType, - ["info_article_type_sort" => $params['info_article_type_sort']], - ["info_article_type_guid" => $params['info_article_type_guid']], - - ); + if (!$model) throwErrorMsg("该资讯文章类型不存在", 1); $model->allowField([ @@ -79,10 +74,7 @@ class infoArticleType extends BaseController 'info_article_type_name|资讯类型名称' => 'require', 'info_article_type_sort|资讯类型排序' => 'require' ]); - Tool::sortInsertProc( - new ModelinfoArticleType, - ["info_article_type_sort" => $params['info_article_type_sort']], - ); + $model = ModelinfoArticleType::create($params, [ 'info_article_type_guid', 'info_article_type_create_user_guid', @@ -103,11 +95,7 @@ class infoArticleType extends BaseController 'info_article_type_guid' => 'require', ]); $guids = explode(',', $params['info_article_type_guid']); - Tool::sortDeleteProc( - new ModelinfoArticleType, - 'info_article_type_sort', - ["info_article_type_guid" => $guids], - ); + $info_article_type = ModelinfoArticleType::where([ 'info_article_type_guid' => explode(',', $params['info_article_type_guid']) ])->select();