|
@@ -47,8 +47,8 @@ public class MarkerInfoDTO {
|
|
|
setGroupNumber(String.valueOf(group.getNumber()));
|
|
|
setLoginName(marker.getUser().getLoginName());
|
|
|
setName(marker.getUser().getName());
|
|
|
- setMarkedCount(marker.getFinishCount());
|
|
|
- setMarkedCountNa(marker.getFinishCountNa());
|
|
|
+ setMarkedCount(marker.getFinishCount() != null ? marker.getFinishCount() : 0);
|
|
|
+ setMarkedCountNa(marker.getFinishCountNa() != null ? marker.getFinishCountNa() : 0);
|
|
|
setEmpno(marker.getUser().getEmpno());
|
|
|
}
|
|
|
|