From 7b7fe93567536e38bfd5e231dc4ada6090c53e86 Mon Sep 17 00:00:00 2001 From: gy <997485446@qq.com> Date: Fri, 31 Mar 2023 10:53:42 +0800 Subject: [PATCH 1/7] feat --- pkg/model/approval.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkg/model/approval.go b/pkg/model/approval.go index 69844c5..8762f3c 100644 --- a/pkg/model/approval.go +++ b/pkg/model/approval.go @@ -168,7 +168,7 @@ func ExistPayApproval(in *approval.CreateRequest) bool { // subQuery1 := DB.Model(&Approval{}).Where(&Approval{SubmitterID: in.SubmitterID, Type: TypeBundlePayPrice}). - Where("status in (?)",[]uint64{StatusDoing,StatusOk}). + Where("status in (?)", []uint64{StatusDoing, StatusOk}). Select("id") DB.Model(&BundlePayPrice{}).Where("approval_id in (?)", subQuery1).Where(&BundlePayPrice{ShowUid: in.BundlePayPrice.ShowUid}).Count(&count) @@ -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") //我未阅读的和我未操作的 @@ -541,7 +543,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的 - Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的 + Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的 modelObj.Count(&count) if len(ids) > 0 { //根据具体id排序 @@ -586,8 +588,8 @@ func MyApprovalWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { if in.UserID != 0 { modelObj = modelObj.Where( DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID). - Where("status != ?", StatusDoing). //完成，我参与审批 - Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, + Where("status != ?", StatusDoing). //完成，我参与审批 + Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送) } @@ -643,8 +645,8 @@ func MyWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { if in.UserID != 0 { modelObj = modelObj.Where( DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID). - Where("status != ?", StatusDoing). //完成，我参与审批 - Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, + Where("status != ?", StatusDoing). //完成，我参与审批 + Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送) } @@ -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") From 9279806673993d04fcbe9ce2e553b5b3618eab05 Mon Sep 17 00:00:00 2001 From: gy <997485446@qq.com> Date: Mon, 10 Apr 2023 16:55:16 +0800 Subject: [PATCH 2/7] fix --- pkg/service/approval.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/service/approval.go b/pkg/service/approval.go index 28d1c10..bee7283 100644 --- a/pkg/service/approval.go +++ b/pkg/service/approval.go @@ -302,6 +302,9 @@ func (a *ApprovalProvider) UpdateSetting(ctx context.Context, in *approval.Setti } else { setting.KeyWord = in.KeyWord + fmt.Println("1-------", copyUsers) + fmt.Println("1-------", copyUsers == nil) + fmt.Println("1-------", len(copyUsers)) setting.CopyUsers = copyUsers setting.ApprovalUsers = approvalUsers //setting.ApproverID = in.ApproverID From cf71298bca716f7968f6f7305a09a786eb63c39c Mon Sep 17 00:00:00 2001 From: gy <997485446@qq.com> Date: Mon, 10 Apr 2023 17:01:45 +0800 Subject: [PATCH 3/7] fix update --- pkg/service/approval.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/service/approval.go b/pkg/service/approval.go index bee7283..84a0d47 100644 --- a/pkg/service/approval.go +++ b/pkg/service/approval.go @@ -302,15 +302,16 @@ func (a *ApprovalProvider) UpdateSetting(ctx context.Context, in *approval.Setti } else { setting.KeyWord = in.KeyWord - fmt.Println("1-------", copyUsers) - fmt.Println("1-------", copyUsers == nil) - fmt.Println("1-------", len(copyUsers)) setting.CopyUsers = copyUsers setting.ApprovalUsers = approvalUsers //setting.ApproverID = in.ApproverID //setting.ApproverName = in.ApproverName err = model.DB.Where(&model.ApprovalSetting{Domain: in.Domain, KeyWord: in.KeyWord}).Updates(&setting).Error + + if copyUsers == nil { //空数组 + model.DB.Where(&model.ApprovalSetting{Domain: in.Domain, KeyWord: in.KeyWord}).Update("copy_users", "[]") + } } if err == nil { From bae6d8326139555dbe48c108661a35d8d63af1d4 Mon Sep 17 00:00:00 2001 From: gy <997485446@qq.com> Date: Mon, 10 Apr 2023 17:09:25 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/service/approval.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/service/approval.go b/pkg/service/approval.go index 84a0d47..9f5c413 100644 --- a/pkg/service/approval.go +++ b/pkg/service/approval.go @@ -309,6 +309,8 @@ func (a *ApprovalProvider) UpdateSetting(ctx context.Context, in *approval.Setti 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.Where(&model.ApprovalSetting{Domain: in.Domain, KeyWord: in.KeyWord}).Update("copy_users", "[]") } From 309523f6c3e50d6c0572d672a273093547072e02 Mon Sep 17 00:00:00 2001 From: gy <997485446@qq.com> Date: Mon, 10 Apr 2023 17:18:53 +0800 Subject: [PATCH 5/7] fix 11 --- pkg/service/approval.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/service/approval.go b/pkg/service/approval.go index 9f5c413..e77b619 100644 --- a/pkg/service/approval.go +++ b/pkg/service/approval.go @@ -312,8 +312,10 @@ func (a *ApprovalProvider) UpdateSetting(ctx context.Context, in *approval.Setti fmt.Println(copyUsers == nil) fmt.Println(copyUsers) if copyUsers == nil { //空数组 - model.DB.Where(&model.ApprovalSetting{Domain: in.Domain, KeyWord: in.KeyWord}).Update("copy_users", "[]") + 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 { From 98cb3e36f43054c1ad6fb17dcb8a13b467663ea7 Mon Sep 17 00:00:00 2001 From: gy <997485446@qq.com> Date: Mon, 10 Apr 2023 17:23:41 +0800 Subject: [PATCH 6/7] 1 --- pkg/service/approval.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/service/approval.go b/pkg/service/approval.go index e77b619..84cf180 100644 --- a/pkg/service/approval.go +++ b/pkg/service/approval.go @@ -312,7 +312,7 @@ func (a *ApprovalProvider) UpdateSetting(ctx context.Context, in *approval.Setti 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.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", "[]") } From b029be9a48ee4ec09e3fc6d067e294c00b6ee6a2 Mon Sep 17 00:00:00 2001 From: gy <997485446@qq.com> Date: Tue, 11 Apr 2023 10:43:57 +0800 Subject: [PATCH 7/7] fix 2 --- pkg/model/approval_copy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/model/approval_copy.go b/pkg/model/approval_copy.go index 26f6c7b..40db5ea 100644 --- a/pkg/model/approval_copy.go +++ b/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 }