diff --git a/app/admin/controller/Works/Works.php b/app/admin/controller/Works/Works.php index 7dd016f..4ecc4e0 100644 --- a/app/admin/controller/Works/Works.php +++ b/app/admin/controller/Works/Works.php @@ -30,26 +30,20 @@ class Works extends BaseController { $query = ModelWorks::where( Tool::getOptionalQuery( - ['works.works_name', 'LIKE'], - ['works.works_author', 'LIKE'], + ['works.works_author_type'], ['works.works_type_guid'], - ['works.classes_guid'], ) )->field([ 'works.works_id', 'works.works_guid', + 'works.works_author_type', 'works.works_img', - 'works.works_name', - 'works.works_author', - 'works.classes_guid', 'works.works_intro', 'works.works_likes_count', 'works.works_order', 'works.works_type_guid', 'works_type.works_type_name', - 'classes.classes_name', ])->leftJoin('works_type', 'works_type.works_type_guid = works.works_type_guid') - ->leftJoin('classes', 'classes.classes_guid = works.classes_guid') ->order('works_order', 'asc'); return msg("获取作品列表成功!", $query); @@ -76,22 +70,17 @@ class Works extends BaseController 'works_likes_count|作品点赞数' => 'require', 'works_order|排序' => 'require', 'works_type_guid|作品类型guid' => 'require', - 'works_name|作品名称' => 'require', - 'works_author|作品作者' => 'require', - 'classes_guid|班型guid' => 'require', ]); $model = ModelWorks::where('works_guid', $params['works_guid'])->find(); if (!$model) throwErrorMsg("该作品不存在", 1); $model->allowField([ 'works_update_user_guid', + 'works_author_type', 'works_img', 'works_intro', 'works_likes_count', 'works_type_guid', 'works_order', - 'works_name', - 'works_author', - 'classes_guid', ])->save($params); Db::commit(); return msg('编辑成功!'); @@ -121,22 +110,17 @@ class Works extends BaseController 'works_likes_count|作品点赞数' => 'require', 'works_order|排序' => 'require', 'works_type_guid|作品类型guid' => 'require', - 'works_name|作品名称' => 'require', - 'works_author|作品作者' => 'require', - 'classes_guid|班型guid' => 'require', ]); ModelWorks::create($params, [ 'works_guid', 'works_create_user_guid', 'works_update_user_guid', + 'works_author_type', 'works_img', 'works_intro', 'works_likes_count', 'works_type_guid', 'works_order', - 'classes_guid', - 'works_author', - 'works_name', ]); Db::commit(); return msg('添加成功!'); diff --git a/app/api/controller/ExaminationInformation/InfoArticle.php b/app/api/controller/ExaminationInformation/InfoArticle.php index f80659a..3053cdb 100644 --- a/app/api/controller/ExaminationInformation/InfoArticle.php +++ b/app/api/controller/ExaminationInformation/InfoArticle.php @@ -78,7 +78,10 @@ class InfoArticle extends BaseController 'info_article_title', 'info_article_content', 'info_article_create_time', + 'info_article_type_guid', + 'info_article_order' ]) + ->hidden(['info_article_type_guid','info_article_order']) ->where('info_article_id', $params['info_article_id']) ->find(); @@ -86,9 +89,10 @@ class InfoArticle extends BaseController // 上下个数据返回 $last_next = Tool::getLastNextData( ModelinfoArticle::class, - $find->info_article_sort, + $find->info_article_order, [ 'field' => ['info_article_id', 'info_article_title'], + 'extraWhere' => [['info_article_type_guid', '=', $find->info_article_type_guid]], ] ); $find['prve'] = $last_next[0]; diff --git a/app/common/model/Works/Works.php b/app/common/model/Works/Works.php index fe6d97b..9e9c2c7 100644 --- a/app/common/model/Works/Works.php +++ b/app/common/model/Works/Works.php @@ -25,9 +25,7 @@ class Works extends BaseModel protected $schema = [ "works_id" => "int", "works_guid" => "string", - "works_name" => "string", - "works_author" => "string", - "classes_guid" => "string", + "works_author_type" => "string", "works_img" => "string", "works_intro" => "string", "works_type_guid" => "string",