优化字典模块

server/services/dict.go

@@ -121,7 +121,7 @@ func GetDictTypeById(id int) (*models.DictType, error) {
 }
 
 // GetDictTypes 获取字典类型列表
-func GetDictTypes(tenantId int, userId int, parentId int, status *int8) ([]*models.DictType, error) {
+func GetDictTypes(tenantId int, userId int, parentId int, status *int8, pageNum int, pageSize int) ([]*models.DictType, int64, error) {
 	o := orm.NewOrm()
 	qs := o.QueryTable("sys_dict_type").Filter("is_deleted", 0)
 
@@ -151,9 +151,24 @@ func GetDictTypes(tenantId int, userId int, parentId int, status *int8) ([]*mode
 		qs = qs.Filter("status", *status)
 	}
 
+	// 获取总数
+	total, err := qs.Count()
+	if err != nil {
+		return nil, 0, err
+	}
+
+	// 分页处理
+	if pageNum <= 0 {
+		pageNum = 1
+	}
+	if pageSize <= 0 {
+		pageSize = 20
+	}
+	offset := (pageNum - 1) * pageSize
+
 	var dictTypes []*models.DictType
-	_, err := qs.OrderBy("sort", "create_time").All(&dictTypes)
-	return dictTypes, err
+	_, err = qs.OrderBy("-id", "sort").Offset(offset).Limit(pageSize).All(&dictTypes)
+	return dictTypes, total, err
 }
 
 // ========== 字典项相关服务 ==========