|
@@ -129,10 +129,12 @@ public class TTrainingDeviceController extends BaseController
|
|
|
}
|
|
|
}else if (d.getSupplementary().equals("0")){
|
|
|
device.add("╳");
|
|
|
- if (tTrainings.get(i).getRegularId() != null) {
|
|
|
+ if (tTrainings.get(i).getRegularId() != null&&d.getStartDate() != null) {
|
|
|
deviceDate.add(sdf1.format(d.getStartDate()));
|
|
|
}else {
|
|
|
- deviceDate.add(sdf.format(d.getStartDate()));
|
|
|
+ if(d.getStartDate() != null){
|
|
|
+ deviceDate.add(sdf.format(d.getStartDate()));
|
|
|
+ }
|
|
|
}
|
|
|
}else if (d.getSupplementary().equals("2")){
|
|
|
device.add("新员工");
|