diff --git a/app/Model/ArticleScience.php b/app/Model/ArticleScience.php index 916015c..5f0d672 100644 --- a/app/Model/ArticleScience.php +++ b/app/Model/ArticleScience.php @@ -18,11 +18,14 @@ use Hyperf\Snowflake\Concern\Snowflake; * @property string $article_title 文章标题 * @property int $article_status 文章状态(1:正常 2:禁用) * @property int $is_top 是否置顶(0:否 1:是) + * @property int $sort 排序值(越大越靠前) * @property string $article_image 文章图片(1张) * @property int $source_id 文章来源id * @property string $article_url 文章地址 - * @property Carbon $created_at 创建时间 - * @property Carbon $updated_at 修改时间 + * @property \Carbon\Carbon $created_at 创建时间 + * @property \Carbon\Carbon $updated_at 修改时间 + * @property-read ArticleScienceSource|null $ArticleScienceSource + * @property-read \Hyperf\Database\Model\Collection|ArticleScienceClass[]|null $ArticleScienceClass */ class ArticleScience extends Model { @@ -36,7 +39,7 @@ class ArticleScience extends Model /** * The attributes that are mass assignable. */ - protected array $fillable = ['article_id', 'article_title', 'article_status', 'is_top', 'article_image', 'source_id', 'article_url', 'created_at', 'updated_at']; + protected array $fillable = ['article_id', 'article_title', 'article_status', 'is_top', 'sort', 'article_image', 'source_id', 'article_url', 'created_at', 'updated_at']; protected string $primaryKey = "article_id"; @@ -108,7 +111,7 @@ class ArticleScience extends Model $query->where($article_science_class_params); }); - $result = $query->orderBy("is_top","desc")->orderBy("created_at","desc")->paginate($per_page, $fields, "page", $page); + $result = $query->orderBy("is_top","desc")->orderBy("sort","desc")->paginate($per_page, $fields, "page", $page); $data = array(); $data['current_page'] = $result->currentPage();// 当前页码 @@ -148,7 +151,7 @@ class ArticleScience extends Model $query->where($article_science_class_params); }); - $data = $query->orderBy("is_top","desc")->orderBy("created_at","desc")->limit($limit)->get($fields); + $data = $query->orderBy("is_top","desc")->orderBy("sort","desc")->limit($limit)->get($fields); return $data; }