diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 9028d493..045b8404 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -288,7 +288,10 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> mapList, List putTime, List xcx, List zcc, StandRegionalTimeDto s) { - putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime())); + //临时 + if (s.getPutTime()!=null){ + putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime())); + } xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq())); zcc.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq())); mapList.put("实施日期("+s.getCountry()+")",putTime);