|
@@ -1829,7 +1829,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
|
|
|
|
|
|
// 校验任务数
|
|
// 校验任务数
|
|
int index = 1;
|
|
int index = 1;
|
|
- if (indexMap.contains(user)) {
|
|
|
|
|
|
+ if (indexMap.containsKey(user)) {
|
|
index = indexMap.get(user) + 1;
|
|
index = indexMap.get(user) + 1;
|
|
}
|
|
}
|
|
indexMap.put(user, index);
|
|
indexMap.put(user, index);
|
|
@@ -1842,9 +1842,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
|
|
.eq(WmTask::getTaskStatus, "3")
|
|
.eq(WmTask::getTaskStatus, "3")
|
|
);
|
|
);
|
|
|
|
|
|
- int taskSize = CollectionUtils.isNotEmpty(wmTasks) ? wmTasks.size() : 0;
|
|
|
|
-
|
|
|
|
- if (scorePackage.getTaskNum() - taskSize <= index ){
|
|
|
|
|
|
+ if (scorePackage.getTaskNum() - wmTasks.size() < index ){
|
|
log.error("超出设定任务数");
|
|
log.error("超出设定任务数");
|
|
errorMap(errorMap, "超出设定任务数", commonEvidenceDTO.getId());
|
|
errorMap(errorMap, "超出设定任务数", commonEvidenceDTO.getId());
|
|
return;
|
|
return;
|