Merge branch 'main' of http://192.168.12.3:8090/bugmaker/management_system/fonchain-approval

pkg/model/approval.go

@@ -532,7 +532,9 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 		Preload("BundlePayPrice").
 		Preload("ApprovalType.ApprovalTypeGroup").
 		Preload("ExhibitionReward.ApprovalExhibitions").
-		Preload("ApprovalWorkFlows").
+		Preload("ApprovalWorkFlows", func(db *gorm.DB) *gorm.DB {
+			return db.Order("level asc")
+		}).
 		Preload("Exhibition.ApprovalExhibitions")
 
 	//我未阅读的和我未操作的
@@ -680,7 +682,9 @@ func MySubmitApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 		Preload("Work.ApprovalWorks").
 		Preload("Bundle").
 		Preload("BundlePayPrice").
-		Preload("ApprovalWorkFlows").
+		Preload("ApprovalWorkFlows", func(db *gorm.DB) *gorm.DB {
+			return db.Order("level asc")
+		}).
 		Preload("ExhibitionReward.ApprovalExhibitions").
 		Preload("ApprovalType.ApprovalTypeGroup").
 		Preload("Exhibition.ApprovalExhibitions")