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

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")

pkg/model/approval_copy.go

@@ -20,7 +20,7 @@ type ApprovalCopy struct {
 func BatchCopySave(users CopyUsers, approvalId uint64) error {
 	var insertRaws []*ApprovalCopy
 
-	if users == nil && len(users) == 0 {
+	if users == nil || len(users) == 0 {
 		return nil
 	}
 

pkg/service/approval.go

@@ -308,6 +308,14 @@ func (a *ApprovalProvider) UpdateSetting(ctx context.Context, in *approval.Setti
 		//setting.ApproverName = in.ApproverName
 
 		err = model.DB.Where(&model.ApprovalSetting{Domain: in.Domain, KeyWord: in.KeyWord}).Updates(&setting).Error
+
+		fmt.Println(copyUsers == nil)
+		fmt.Println(copyUsers)
+		if copyUsers == nil { //空数组
+			model.DB.Exec("UPDATE approval_setting SET copy_users = '[]' WHERE id = ?", setting.ID)
+			//model.DB.Where(&model.ApprovalSetting{Domain: in.Domain, KeyWord: in.KeyWord}).Update("copy_users", "[]")
+		}
+
 	}
 
 	if err == nil {