Merge branch 'dev_aliyun' into educoder

app/controllers/ec_course_evaluations_controller.rb

@@ -169,7 +169,8 @@ class EcCourseEvaluationsController < ApplicationController
             else
               score_count = @ce.evluation_count * length
               EcStudentAchievement.where(:ec_course_evaluation_subitem_id => subitems.pluck(:id)).destroy_all
-              score_type = worksheet.cell(2, score_count+1) && worksheet.cell(2, score_count+2) ? 1 : 2
+              score_type = worksheet.cell(1, 1) && worksheet.cell(1, 1).try(:strip) == "学号" ? 1 : 2
+
               if score_type == 2 && rows > 3
                 render :json => {status: 0, message: "平均成绩只能有一行数据"}
               else

public/react/src/modules/ec/ecCourseSupportSetting/EditableCourseSupportSetting.js

@@ -289,7 +289,7 @@ class EditableCourseSupportSetting extends Component {
         standard_grade[item.position] = (item.standard_grade);
         // biyeYaoqiuZhibiaodian[item.position] = (item.biyeYaoqiuZhibiaodian);
 
-        subitem_id[item.position] = (item.subitem_id).toString();
+        subitem_id[item.position] = item.subitem_id ? (item.subitem_id).toString() : item.subitem_id;
 
         this.position2Target_idMap[item.position] = item.target_id
     })