Merge branch 'jhc' into dev

pkg/model/approval.go

@@ -543,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排序
@@ -588,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))) //抄送人(完成抄送)
 	}
 
@@ -645,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))) //抄送人(完成抄送)
 	}
 
@@ -725,7 +725,7 @@ func MyReadApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 		modelObj = modelObj.Where(&Approval{Type: in.Type})
 	}
 
-	modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID})
+	//modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID})
 
 	modelObj.Where(" json_contains(copy_users,JSON_OBJECT('ID', ?))", in.UserID)