|
@@ -490,11 +490,11 @@ public class ExamMarkerController extends BaseParameterController {
|
|
Marker old = markerService.findByLoginName(marker.getLoginName());
|
|
Marker old = markerService.findByLoginName(marker.getLoginName());
|
|
if(old!=null){
|
|
if(old!=null){
|
|
marker = old;
|
|
marker = old;
|
|
- }
|
|
|
|
- if(examId != old.getExamId()){
|
|
|
|
- failureMsg.append("<br/>评卷员 " + marker.getLoginName() + "," + MarkerExcelError.MARKERED.getName());
|
|
|
|
- failureNum++;
|
|
|
|
- continue;
|
|
|
|
|
|
+ if(examId != old.getExamId()){
|
|
|
|
+ failureMsg.append("<br/>评卷员 " + marker.getLoginName() + "," + MarkerExcelError.MARKERED.getName());
|
|
|
|
+ failureNum++;
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
}else if(saveMap.get(marker.getLoginName())!=null){
|
|
}else if(saveMap.get(marker.getLoginName())!=null){
|
|
marker = saveMap.get(marker.getLoginName());
|
|
marker = saveMap.get(marker.getLoginName());
|
|
}else{
|
|
}else{
|