feature(基础模块优化):优化排序

opms_admin/app/service/sys_dept.go

@@ -36,7 +36,7 @@ func (s *DeptService) GetList(searchParams *model.SysDeptSearchParams) ([]*model
 		deptModel = deptModel.Where("status", searchParams.Status)
 	}
 	depts := ([]*model.SysDept)(nil)
-	if err := deptModel.Scan(&depts); err != nil {
+	if err := deptModel.OrderAsc(s.Dao.C.Sort).Scan(&depts); err != nil {
 		return nil, err
 	}
 	list := make([]*model.SysDept, 0, len(depts))

opms_admin/app/service/sys_group.go

@@ -44,7 +44,7 @@ func (s *GroupService) GetList(req *model.SysGroupSearchParams) (total int, list
 		err = myerrors.TipsError("获取总行数失败")
 	}
 
-	err = db.Page(req.GetPage()).Order("sort asc,id asc").Scan(&list)
+	err = db.Page(req.GetPage()).OrderAsc(s.Dao.C.Sort).Scan(&list)
 	if err != nil {
 		g.Log().Error(err)
 		err = myerrors.TipsError("获取数据失败")

opms_admin/app/service/sys_menu.go

@@ -156,7 +156,7 @@ func (s MenuService) GetList(param *menu_def.SelectReq) ([]model.SysMenu, error)
 	}
 
 	result := make([]model.SysMenu, 0)
-	if err := db.FindScan(&result); err != nil {
+	if err := db.OrderAsc(s.Dao.C.Sort).FindScan(&result); err != nil {
 		return nil, err
 	}
 	return result, nil
@@ -169,7 +169,7 @@ func (s MenuService) GetMenuTree(isAll bool) ([]model.MenuTree, error) {
 		menuType = g.Slice{"M", "C", "F"}
 	}
 	menuList := make([]model.SysMenu, 0)
-	err := s.Dao.Where("status = 10").Where("menu_type IN (?)", menuType).Order("sort").Scan(&menuList)
+	err := s.Dao.Where("status = 10").Where("menu_type IN (?)", menuType).OrderAsc(s.Dao.C.Sort).Scan(&menuList)
 
 	treeMap := make(map[int][]model.MenuTree, 0)
 	for _, v := range menuList {
@@ -187,7 +187,7 @@ func (s MenuService) GetUserRoleMenuTree(roles []int) ([]model.MenuTree, error)
 	menuList := make([]model.SysMenu, 0)
 	err := s.Dao.Where(s.Dao.C.Status, "10").WhereIn(s.Dao.C.MenuType, g.Slice{"M", "C"}).
 		WhereIn(s.Dao.C.Id, dao.NewSysRoleMenuDao(s.Tenant).WhereIn(dao.SysRoleMenu.C.RoleId, roles).Fields(dao.SysRoleMenu.C.MenuId).M).
-		Order("sort").Scan(&menuList)
+		OrderAsc(s.Dao.C.Sort).Scan(&menuList)
 	if err != nil {
 		return nil, err
 	}

opms_admin/app/service/sys_post.go

@@ -47,7 +47,7 @@ func (s *PostService) GetList(req *model.SysPostSearchParams) (total int, list [
 		err = myerrors.TipsError("获取总行数失败")
 	}
 
-	err = db.Page(req.GetPage()).Order(s.Dao.C.Sort + " asc," + s.Dao.C.Id + " asc").Scan(&list)
+	err = db.Page(req.GetPage()).OrderAsc(s.Dao.C.Sort).Scan(&list)
 	if err != nil {
 		g.Log().Error(err)
 		err = myerrors.TipsError("获取数据失败")

opms_admin/app/service/sys_role.go

@@ -32,7 +32,7 @@ func NewRoleService(ctx context.Context) (svc *RoleService, err error) {
 // GetRoleList 获取角色列表
 func (s *RoleService) GetRoleList() (list []*model.SysRole, err error) {
 	//从数据库获取
-	list, err = s.Dao.Order(s.Dao.C.Sort + " asc," + s.Dao.C.Id + " asc").All()
+	list, err = s.Dao.OrderAsc(s.Dao.C.Sort).All()
 	if err != nil {
 		g.Log().Error(err)
 		err = gerror.New("获取角色数据失败")
@@ -60,7 +60,7 @@ func (s *RoleService) GetRoleListSearch(req *model.SelectPageReq) (total int, li
 		err = gerror.New("获取总行数失败")
 		return
 	}
-	err = db.Page(req.GetPage()).Order("id asc").Scan(&list)
+	err = db.Page(req.GetPage()).OrderAsc(s.Dao.C.Sort).Scan(&list)
 	if err != nil {
 		g.Log().Error(err)
 		err = gerror.New("获取数据失败")