fix marker import

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/parameter/ExamMarkerController.java

@@ -515,9 +515,12 @@ public class ExamMarkerController extends BaseParameterController {
             		examSubject.setMarkers(new HashSet<Marker>());
             	}
             	Set<Marker> markers = examSubject.getMarkers();
+            	
             	Marker old = markerService.findByLoginName(marker.getLoginName());
             	if(old!=null){
-            		markers.add(old);
+            		marker = old;
+            	}else if(saveMap.get(marker.getLoginName())!=null){
+            		marker = saveMap.get(marker.getLoginName());
             	}else{
             		String password = "";
             		if (StringUtils.isBlank(marker.getSubjectCode()) || StringUtils.isBlank(marker.getLoginName())) {
@@ -538,8 +541,8 @@ public class ExamMarkerController extends BaseParameterController {
             			failureNum++;
                     }
             		saveMap.put(marker.getLoginName(), marker);
-            		markers.add(marker);
             	}
+            	markers.add(marker);
             	examSubject.setMarkers(markers);
             	current.put(examSubject.getCode(), examSubject);
             }

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -96,7 +96,7 @@ public class MarkController extends BaseController {
         current.setLastLoginIp(request.getRemoteAddr());
         current.setLastLoginTime(new Date());
         markerService.save(current);
-        return new ModelAndView("redirect:/mark/index");
+        return new ModelAndView("redirect:/mark/subject-select");
     }
 
     @RequestMapping(value = "/subject-select", method = RequestMethod.GET)