LY

master/src/main/java/com/ruoyi/project/ticket/controller/THazardWorkPermitController.java

@@ -199,8 +199,12 @@ public class THazardWorkPermitController extends BaseController {
         params.put("bDeviceName" , Texts.of(tHazardWorkPermit.getbDeviceName()).fontSize(7).bold().create());
         params.put("bAreaNo" , Texts.of(tHazardWorkPermit.getbAreaNo()).fontSize(7).bold().create());
         params.put("bWorkContent" , Texts.of(tHazardWorkPermit.getbWorkContent()).fontSize(7).bold().create());
-        params.put("bValidityStartTime" , Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tHazardWorkPermit.getbValidityStartTime())).fontSize(7).bold().create());
-        params.put("bValidityEndTime" , Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tHazardWorkPermit.getbValidityEndTime())).fontSize(7).bold().create());
+        if (tHazardWorkPermit.getbValidityStartTime()!= null) {
+            params.put("bValidityStartTime" , Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tHazardWorkPermit.getbValidityStartTime())).fontSize(7).bold().create());
+        }
+        if (tHazardWorkPermit.getbValidityEndTime()!= null) {
+            params.put("bValidityEndTime" , Texts.of(DateUtils.parseDateToStr("yyyy年MM月dd日hh时mm分",tHazardWorkPermit.getbValidityEndTime())).fontSize(7).bold().create());
+        }
         // C 栏
         getCheck(params ,tHazardWorkPermit.getcIsDanger(),"cIsDanger");
         List<TMatter> tMatters = tMatterMapper.selectTMatterList(new TMatter());