fixbugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/TaskServiceImpl.java

@@ -200,13 +200,13 @@ public class TaskServiceImpl implements TaskService {
         List<ExamQuestion> sList = questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(group.getExamId(),
                 group.getSubjectCode(), false, group.getNumber());
         int number = 0;
+        List<MarkTrack> tracks = trackService.findByLibraryId(libraryId);
         for (ExamQuestion question : sList) {
             number++;
 
             MarkStepDTO step = buildStep(number, question);
             if (libraryId != null) {
                 // 增加阅卷轨迹列表获取
-                List<MarkTrack> tracks = trackService.findByLibraryId(libraryId);
                 String questionNumber = question.getQuestionNumber();
                 for (MarkTrack track : tracks) {
                     if (track.getQuestionNumber().equals(questionNumber)) {
@@ -224,13 +224,12 @@ public class TaskServiceImpl implements TaskService {
         List<ExamQuestion> sList = questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(group.getExamId(),
                 group.getSubjectCode(), false, group.getNumber());
         int number = 0;
+        List<TrialTrack> tracks = trialService.findTrack(history.getLibraryId(), history.getMarkerId());
         for (ExamQuestion question : sList) {
             number++;
-
             MarkStepDTO step = buildStep(number, question);
             if (history != null) {
                 // 增加阅卷轨迹列表获取
-                List<TrialTrack> tracks = trialService.findTrack(history.getLibraryId(), history.getMarkerId());
                 String questionNumber = question.getQuestionNumber();
                 for (TrialTrack track : tracks) {
                     if (track.getQuestionNumber().equals(questionNumber)) {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -103,6 +103,9 @@ public class UserController extends BaseController {
                 user.setCreatedTime(new Date());
                 user.setUpdatedTime(new Date());
                 userService.save(user);
+                if (user.getRole() == Role.SUBJECT_HEADER) {
+                    subjectUserService.updateByUserId(user.getId(), getSubjectCodeSet(subjectCodeString));
+                }
             } else {
                 model.addAttribute("user", user);
                 model.addAttribute("roleList", ROLE_LIST);