|
@@ -142,7 +142,10 @@ public class MarkServiceImpl implements MarkService {
|
|
@Override
|
|
@Override
|
|
public int applyCount(MarkGroup group) {
|
|
public int applyCount(MarkGroup group) {
|
|
TaskLock taskLock = getTaskLock(group);
|
|
TaskLock taskLock = getTaskLock(group);
|
|
- int count = taskLock.count();
|
|
|
|
|
|
+ int count = 0;
|
|
|
|
+ if (taskLock != null) {
|
|
|
|
+ count = taskLock.count();
|
|
|
|
+ }
|
|
return count;
|
|
return count;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -155,15 +158,16 @@ public class MarkServiceImpl implements MarkService {
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
public int applyCount(Marker marker) {
|
|
public int applyCount(Marker marker) {
|
|
|
|
+ int count = 0;
|
|
MarkGroup group = marker.getGroup();
|
|
MarkGroup group = marker.getGroup();
|
|
if (group == null) {
|
|
if (group == null) {
|
|
group = groupDao.findOne(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
|
|
group = groupDao.findOne(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
|
|
}
|
|
}
|
|
- if (group != null) {
|
|
|
|
- TaskLock taskLock = getTaskLock(group);
|
|
|
|
- return taskLock.count(marker.getId());
|
|
|
|
|
|
+ TaskLock taskLock = getTaskLock(group);
|
|
|
|
+ if (taskLock != null) {
|
|
|
|
+ count = taskLock.count(marker.getId());
|
|
}
|
|
}
|
|
- return 0;
|
|
|
|
|
|
+ return count;
|
|
}
|
|
}
|
|
|
|
|
|
private TaskLock getTaskLock(MarkGroup group) {
|
|
private TaskLock getTaskLock(MarkGroup group) {
|