LY 会议

master/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -79,6 +79,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 
     public static final String parseDateToStr(final String format, final Date date)
     {
+        if (date == null) {
+            return "";
+        }
         return new SimpleDateFormat(format).format(date);
     }
 

master/src/main/java/com/ruoyi/project/plant/controller/TMtdDailyController.java

@@ -283,7 +283,9 @@ public class TMtdDailyController extends BaseController
                 SysUser sysUser = sysUserMapper.selectUserByStaffId(t.getActionby());
                 t.setActionName(sysUser.getNickName());
             }
-            t.setBeginTime(DateUtils.parseDateToStr("MM-dd",tMtdDaily.getMeetingDate()));
+            if (tMtdDaily.getMeetingDate() != null) {
+                t.setBeginTime(DateUtils.parseDateToStr("MM-dd",tMtdDaily.getMeetingDate()));
+            }
             num++;
         }
         return items;
@@ -311,8 +313,11 @@ public class TMtdDailyController extends BaseController
      */
     public Map<String, Object> getWordData(TMtdDaily tMtdDaily) {
         Map<String, Object> params = new HashMap<>();
-        params.put("meetingDate", DateUtils.parseDateToStr("YYYY-MM-dd",tMtdDaily.getMeetingDate()));
-        params.put("reDate", DateUtils.parseDateToStr("MM-dd",tMtdDaily.getMeetingDate()));
+        if (tMtdDaily.getMeetingDate() != null) {
+            params.put("meetingDate", DateUtils.parseDateToStr("YYYY-MM-dd",tMtdDaily.getMeetingDate()));
+            params.put("reDate", DateUtils.parseDateToStr("MM-dd",tMtdDaily.getMeetingDate()));
+        }
+
         params.put("venue", tMtdDaily.getVenue());
 
         params.put("optMode", tMtdDaily.getOptMode());
@@ -322,9 +327,10 @@ public class TMtdDailyController extends BaseController
         params.put("aeu", tMtdDaily.getAeu());
 
         logger.info("tMtdDaily.getRecorder()" + tMtdDaily.getRecorder());
-        SysUser recorder = sysUserMapper.selectUserByStaffId(tMtdDaily.getRecorder());
-        params.put("recorder", recorder.getNickName());
-
+        if (StringUtils.isNotEmpty(tMtdDaily.getRecorder())) {
+            SysUser recorder = sysUserMapper.selectUserByStaffId(tMtdDaily.getRecorder());
+            params.put("recorder", recorder.getNickName());
+        }
         params.put("cracker",tMtdDaily.getAttendCracker());
         params.put("ctm",tMtdDaily.getAttendCtm());
         params.put("cta",tMtdDaily.getAttendCta());