1. 修复BUG 4096 考核评分结果显示优先级顺序（考核评分 -> 上级评分 -> 360+HR+自评）

@@ -1410,12 +1410,12 @@ func (srv *SummaryEvaluationService) ConfirmScoreEvaluation(param *command.Confi
 		}
 		}
 
 
 		if super != nil {
 		if super != nil {
-			_, itemValues, err = itemValueRepo.Find(map[string]interface{}{"summaryEvaluationId": super.Id}) // 获取已填写的评估内容
+			_, superValues, err := itemValueRepo.Find(map[string]interface{}{"summaryEvaluationId": super.Id}) // 获取已填写的评估内容
 			if err != nil {
 			if err != nil {
 				return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 				return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 			}
 			}
 			// 更新填写值
 			// 更新填写值
-			itemValues, err = srv.updateItemValuePriority(result, itemList, itemValues, true)
+			itemValues, err = srv.updateItemValuePriority(result, itemList, superValues, true)
 			if err != nil {
 			if err != nil {
 				return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 				return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 			}
 			}
@@ -1430,13 +1430,13 @@ func (srv *SummaryEvaluationService) ConfirmScoreEvaluation(param *command.Confi
 			}
 			}
 			if len(evaluationIds) > 0 {
 			if len(evaluationIds) > 0 {
 				// 已填写的评估内容
 				// 已填写的评估内容
-				_, itemValues, err = itemValueRepo.Find(map[string]interface{}{"summaryEvaluationIdList": evaluationIds})
+				_, otherValues, err := itemValueRepo.Find(map[string]interface{}{"summaryEvaluationIdList": evaluationIds})
 				if err != nil {
 				if err != nil {
 					return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 					return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 				}
 				}
 
 
 				// 更新填写值
 				// 更新填写值
-				itemValues, err = srv.updateItemValuePriority(result, itemList, itemValues, false)
+				itemValues, err = srv.updateItemValuePriority(result, itemList, otherValues, false)
 				if err != nil {
 				if err != nil {
 					return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 					return application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 				}
 				}