|
@@ -433,6 +433,9 @@ func (srv *SummaryEvaluationService) EvaluationHRBPList(param *command.QueryEval |
|
@@ -433,6 +433,9 @@ func (srv *SummaryEvaluationService) EvaluationHRBPList(param *command.QueryEval |
|
433
|
|
433
|
|
|
434
|
// 必须是HRBP权限的人才能编辑操作
|
434
|
// 必须是HRBP权限的人才能编辑操作
|
|
435
|
hrbp, err := service.GetHRBP(transactionContext, param.CompanyId, param.UserId)
|
435
|
hrbp, err := service.GetHRBP(transactionContext, param.CompanyId, param.UserId)
|
|
|
|
436
|
+ if err != nil {
|
|
|
|
437
|
+ return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
|
438
|
+ }
|
|
436
|
if hrbp != 1 {
|
439
|
if hrbp != 1 {
|
|
437
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "没有操作权限")
|
440
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "没有操作权限")
|
|
438
|
}
|
441
|
}
|
|
@@ -481,9 +484,8 @@ func (srv *SummaryEvaluationService) EvaluationHRBPList(param *command.QueryEval |
|
@@ -481,9 +484,8 @@ func (srv *SummaryEvaluationService) EvaluationHRBPList(param *command.QueryEval |
|
481
|
positionIds := make([]int, 0)
|
484
|
positionIds := make([]int, 0)
|
|
482
|
for i := range users {
|
485
|
for i := range users {
|
|
483
|
userMap[users[i].Id] = users[i]
|
486
|
userMap[users[i].Id] = users[i]
|
|
484
|
- for _, pid := range users[i].PositionId {
|
|
|
|
485
|
- positionIds = append(positionIds, pid)
|
|
|
|
486
|
- }
|
487
|
+ positionIds = append(positionIds, users[i].PositionId...)
|
|
|
|
488
|
+
|
|
487
|
}
|
489
|
}
|
|
488
|
if len(positionIds) > 0 {
|
490
|
if len(positionIds) > 0 {
|
|
489
|
_, positions, err := positionRepo.Find(map[string]interface{}{"ids": positionIds, "companyId": param.CompanyId})
|
491
|
_, positions, err := positionRepo.Find(map[string]interface{}{"ids": positionIds, "companyId": param.CompanyId})
|
|
@@ -674,6 +676,9 @@ func (srv *SummaryEvaluationService) EditEvaluationHRBP(param *command.EditEvalu |
|
@@ -674,6 +676,9 @@ func (srv *SummaryEvaluationService) EditEvaluationHRBP(param *command.EditEvalu |
|
674
|
|
676
|
|
|
675
|
// 必须是HRBP权限的人才能编辑操作
|
677
|
// 必须是HRBP权限的人才能编辑操作
|
|
676
|
hrbp, err := service.GetHRBP(transactionContext, param.CompanyId, param.ExecutorId)
|
678
|
hrbp, err := service.GetHRBP(transactionContext, param.CompanyId, param.ExecutorId)
|
|
|
|
679
|
+ if err != nil {
|
|
|
|
680
|
+ return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
|
681
|
+ }
|
|
677
|
if hrbp != 1 {
|
682
|
if hrbp != 1 {
|
|
678
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "没有操作权限")
|
683
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "没有操作权限")
|
|
679
|
}
|
684
|
}
|