fix check approval initiator

Signed-off-by: Patrick Zhao <[email protected]>
koderover · Jan 24, 2025 · 437e0ee · 437e0ee
1 parent adb945a
commit 437e0ee
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_approval.go b/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_approval.go
@@ -201,6 +201,9 @@ func waitForLarkApprove(ctx context.Context, spec *commonmodels.JobTaskApprovalS
 
 	var userID string
 	if approval.DefaultApprovalInitiator == nil {
+		if workflowCtx.WorkflowTaskCreatorMobile == "" {
+			return config.StatusFailed, errors.New("审批发起人手机号码未找到，请正确配置您的手机号码")
+		}
 		userInfo, err := client.GetUserIDByEmailOrMobile(lark.QueryTypeMobile, workflowCtx.WorkflowTaskCreatorMobile, setting.LarkUserOpenID)
 		if err != nil {
 			return config.StatusFailed, fmt.Errorf("get user lark id by mobile-%s, error: %s", workflowCtx.WorkflowTaskCreatorMobile, err)
@@ -535,6 +538,9 @@ func waitForDingTalkApprove(ctx context.Context, spec *commonmodels.JobTaskAppro
 
 	var userID string
 	if approval.DefaultApprovalInitiator == nil {
+		if workflowCtx.WorkflowTaskCreatorMobile == "" {
+			return config.StatusFailed, errors.New("审批发起人手机号码未找到，请正确配置您的手机号码")
+		}
 		userIDResp, err := client.GetUserIDByMobile(workflowCtx.WorkflowTaskCreatorMobile)
 		if err != nil {
 			return config.StatusFailed, fmt.Errorf("get user dingtalk id by mobile-%s error: %s", workflowCtx.WorkflowTaskCreatorMobile, err)

diff --git a/pkg/microservice/aslan/core/release_plan/service/approval.go b/pkg/microservice/aslan/core/release_plan/service/approval.go
@@ -121,6 +121,9 @@ func createDingTalkApproval(approval *models.DingTalkApproval, manager, phone, c
 
 	var userID string
 	if approval.DefaultApprovalInitiator == nil {
+		if phone == "" {
+			return errors.New("审批发起人手机号码未找到，请正确配置您的手机号码")
+		}
 		userIDResp, err := client.GetUserIDByMobile(phone)
 		if err != nil {
 			return errors.Wrapf(err, "get user dingtalk id by mobile-%s", phone)
@@ -414,6 +417,10 @@ func createWorkWXApproval(approval *models.WorkWXApproval, manager, phone, conte
 	if approval.CreatorUser != nil {
 		applicant = approval.CreatorUser.ID
 	} else {
+		if phone == "" {
+			return errors.New("审批发起人手机号码未找到，请正确配置您的手机号码")
+		}
+
 		content = fmt.Sprintf("审批发起人: %s\n%s", manager, content)
 		phoneInt, err := strconv.Atoi(phone)
 		if err != nil {
@@ -477,6 +484,9 @@ func createLarkApproval(approval *models.LarkApproval, manager, phone, content s
 
 	var userID string
 	if approval.DefaultApprovalInitiator == nil {
+		if phone == "" {
+			return errors.New("审批发起人手机号码未找到，请正确配置您的手机号码")
+		}
 		userInfo, err := client.GetUserIDByEmailOrMobile(lark.QueryTypeMobile, phone, setting.LarkUserOpenID)
 		if err != nil {
 			return errors.Wrapf(err, "get user lark id by mobile-%s", phone)

diff --git a/pkg/microservice/aslan/core/workflow/service/workflow/workflow_task_v4.go b/pkg/microservice/aslan/core/workflow/service/workflow/workflow_task_v4.go
@@ -335,10 +335,6 @@ func CheckWorkflowV4ApprovalInitiator(workflowName, uid string, log *zap.Sugared
 		return errors.New("failed to get user info by id")
 	}
 
-	if len(userInfo.Phone) == 0 {
-		return e.ErrCheckApprovalPhoneNotFound.AddDesc("phone not configured")
-	}
-
 	// If default approval initiator is not set, check whether the user's mobile phone number can be queried
 	// and only need to check once for each im app type
 	isMobileChecked := map[string]bool{}
@@ -362,6 +358,10 @@ func CheckWorkflowV4ApprovalInitiator(workflowName, uid string, log *zap.Sugared
 					}
 
 					if initiator := spec.LarkApproval.DefaultApprovalInitiator; initiator == nil {
+						if len(userInfo.Phone) == 0 {
+							return e.ErrCheckApprovalPhoneNotFound.AddDesc("phone not configured")
+						}
+
 						if isMobileChecked[spec.LarkApproval.ID] {
 							continue
 						}
@@ -382,6 +382,10 @@ func CheckWorkflowV4ApprovalInitiator(workflowName, uid string, log *zap.Sugared
 					}
 
 					if initiator := spec.DingTalkApproval.DefaultApprovalInitiator; initiator == nil {
+						if len(userInfo.Phone) == 0 {
+							return e.ErrCheckApprovalPhoneNotFound.AddDesc("phone not configured")
+						}
+
 						if isMobileChecked[spec.DingTalkApproval.ID] {
 							continue
 						}
@@ -403,6 +407,10 @@ func CheckWorkflowV4ApprovalInitiator(workflowName, uid string, log *zap.Sugared
 					}
 
 					if initiator := spec.WorkWXApproval.CreatorUser; initiator == nil {
+						if len(userInfo.Phone) == 0 {
+							return e.ErrCheckApprovalPhoneNotFound.AddDesc("phone not configured")
+						}
+
 						if isMobileChecked[spec.DingTalkApproval.ID] {
 							continue
 						}