|
@@ -91,8 +91,16 @@ public class ZhcxCommissionCheckParameterSetDetalServiceImpl extends ServiceImpl
|
|
|
List<String> actualDayList = new ArrayList<>();
|
|
|
// 拿到放假的日期
|
|
|
String selectholidaydetail = baseMapper.selectholidaydetail();
|
|
|
+ // 防止空指针异常
|
|
|
+ if(StringUtils.isEmpty(selectholidaydetail)){
|
|
|
+ selectholidaydetail = "";
|
|
|
+ }
|
|
|
// 拿到上班的日期
|
|
|
String selectNotholidaydetail = baseMapper.selectNotholidaydetail();
|
|
|
+ // 防止空指针异常
|
|
|
+ if(StringUtils.isEmpty(selectNotholidaydetail)){
|
|
|
+ selectNotholidaydetail = "";
|
|
|
+ }
|
|
|
Date baseDate = new Date();
|
|
|
while (actualDayList.size() != dayNum){
|
|
|
// 拿到第一次偏转的日期
|