Merge branch '1.3.2-bug' into test

@@ -41,10 +41,8 @@ spec:
                   - key: kubernetes.io/hostname
                   - key: kubernetes.io/hostname
                     operator: In
                     operator: In
                     values:
                     values:
-                      - cn-hangzhou.i-bp1djh1xn7taumbue1ze
                       - cn-hangzhou.i-bp1djh1xn7taumbue1zd
                       - cn-hangzhou.i-bp1djh1xn7taumbue1zd
-                      - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
-                      - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
+
       containers:
       containers:
         - name: performance-back
         - name: performance-back
           image: 192.168.0.243:5000/mmm/performance-back:master
           image: 192.168.0.243:5000/mmm/performance-back:master

@@ -41,7 +41,7 @@ spec:
                   - key: kubernetes.io/hostname
                   - key: kubernetes.io/hostname
                     operator: In
                     operator: In
                     values:
                     values:
-                      - cn-hangzhou.i-bp1djh1xn7taumbue1ze
+                      - cn-hangzhou.i-bp1djh1xn7taumbue1zd
       containers:
       containers:
         - name: performance-back
         - name: performance-back
           image: 192.168.0.243:5000/mmm/performance-back:dev
           image: 192.168.0.243:5000/mmm/performance-back:dev

@@ -21,11 +21,11 @@ func (notices notifyConfirmEvaluationScore) from() string {
 func (notices notifyConfirmEvaluationScore) makeNotify(param *domain.SummaryEvaluation) *domain.LogSms {
 func (notices notifyConfirmEvaluationScore) makeNotify(param *domain.SummaryEvaluation) *domain.LogSms {
 	newSms := domain.LogSms{
 	newSms := domain.LogSms{
 		Id:         0,
 		Id:         0,
-		Phone:      param.Executor.Account,
+		Phone:      param.TargetUser.Account,
 		TemplateId: 5634326,
 		TemplateId: 5634326,
 		Template:   "您好，#name#，#periodName#成绩已出，请前往绩效系统PC端进行确认哦，超时未确认可能会影响当月绩效工资哦~  ",
 		Template:   "您好，#name#，#periodName#成绩已出，请前往绩效系统PC端进行确认哦，超时未确认可能会影响当月绩效工资哦~  ",
 		Value: map[string]string{
 		Value: map[string]string{
-			"name":       param.Executor.UserName,
+			"name":       param.TargetUser.UserName,
 			"periodName": param.CycleName,
 			"periodName": param.CycleName,
 		},
 		},
 		Result:    "",
 		Result:    "",

@@ -668,6 +668,11 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSelf(param *domain.
 			if err != nil {
 			if err != nil {
 				return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
 				return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
 			}
 			}
+			//添加确认绩效成绩提醒短信提醒
+			err = notify.AddNotifyConfirmEvaluationScore(evaluationFinishList[0])
+			if err != nil {
+				return application.ThrowError(application.TRANSACTION_ERROR, "创建短信提醒失败"+err.Error())
+			}
 		}
 		}
 	}
 	}
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
@@ -767,8 +772,14 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluation360Hrbp(param *doma
 			if err != nil {
 			if err != nil {
 				return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
 				return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
 			}
 			}
+			//添加确认绩效成绩提醒短信提醒
+			err = notify.AddNotifyConfirmEvaluationScore(evaluationFinishList[0])
+			if err != nil {
+				return application.ThrowError(application.TRANSACTION_ERROR, "创建短信提醒失败"+err.Error())
 			}
 			}
 		}
 		}
+
+	}
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 	}
@@ -824,16 +835,17 @@ func (srv *SummaryEvaluationService) AfterCompletedEvaluationSuper(param *domain
 		if err != nil {
 		if err != nil {
 			return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
 			return application.ThrowError(application.INTERNAL_SERVER_ERROR, "保存考核结果，"+err.Error())
 		}
 		}
+		//添加确认绩效成绩提醒短信提醒
+		err = notify.AddNotifyConfirmEvaluationScore(evaluationList[0])
+		if err != nil {
+			return application.ThrowError(application.TRANSACTION_ERROR, "创建短信提醒失败"+err.Error())
+		}
 	}
 	}
 
 
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 	}
-	//添加确认绩效成绩提醒短信提醒
-	err = notify.AddNotifyConfirmEvaluationScore(param)
-	if err != nil {
-		return application.ThrowError(application.TRANSACTION_ERROR, "创建短信提醒失败"+err.Error())
-	}
+
 	return nil
 	return nil
 }
 }