🎨 一堆杂七杂八的优化

service/app/user.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"errors"
 	"fmt"
 	"git.echol.cn/loser/lckt/global"
 	"git.echol.cn/loser/lckt/model/app"
@@ -166,12 +167,13 @@ func (u *AppUserService) ApplyTeacher(p app.TeacherApply) (err error) {
 	return nil
 }
 
-func (u *AppUserService) GetTeacherApplyStatus(id uint) (teacherApply app.TeacherApply, err error) {
+func (u *AppUserService) GetTeacherApplyStatus(id uint) (teacherApply *app.TeacherApply, err error) {
 	// 获取最后一条申请记录
 	err = global.GVA_DB.Model(&app.TeacherApply{}).Where("user_id = ?", id).Last(&teacherApply).Error
-	if err != nil {
-		global.GVA_LOG.Error("查询申请记录失败", zap.Error(err))
-		return teacherApply, err
+	// 判断是否是记录未找到的错误
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		global.GVA_LOG.Error("查询申请信息失败", zap.Error(err))
+		return
 	}
 	return
 

service/article/article.go

@@ -35,6 +35,17 @@ func (ArticleService) GetArticleList(pageInfo request.GetList) (list []article.A
 	offset := pageInfo.PageSize * (pageInfo.Page - 1)
 	// 创建db
 	db := global.GVA_DB.Model(&article.Article{})
+
+	if pageInfo.Title != "" {
+		db = db.Where("title LIKE ?", "%"+pageInfo.Title+"%")
+	}
+	if pageInfo.CategoryId != 0 {
+		db = db.Where("category_id = ?", pageInfo.CategoryId)
+	}
+	if pageInfo.TeacherId != 0 {
+		db = db.Where("teacher_id = ?", pageInfo.TeacherId)
+	}
+
 	err = db.Count(&total).Error
 	if err != nil {
 		return