Browse Source

张丁 修复 内网-培训成绩-装置级培训记录的报错

zhangding 3 years ago
parent
commit
0d93087a13

+ 4 - 2
master/src/main/java/com/ruoyi/project/training/controller/TTrainingDeviceController.java

@@ -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("新员工");