|
@@ -546,7 +546,13 @@ public class ExamMarkerController extends BaseParameterController {
|
|
|
}
|
|
|
MarkerExcelError markerExcelError = checkExcelData(markerDTO,current);
|
|
|
if (markerExcelError.equals(MarkerExcelError.MARKER)) {
|
|
|
- Marker marker = current.get(markerDTO.getLoginName());
|
|
|
+ Marker marker = null;
|
|
|
+ if(current != null){
|
|
|
+ marker = current.get(markerDTO.getLoginName());
|
|
|
+ }else {
|
|
|
+ marker = markerService.findByLoginName(markerDTO.getLoginName());
|
|
|
+ }
|
|
|
+// Marker marker = current.get(markerDTO.getLoginName());
|
|
|
marker.setLoginName(markerDTO.getNewLoginName());
|
|
|
marker.setPassword(markerDTO.getPassword());
|
|
|
saveList.add(marker);
|