Merge remote-tracking branch 'origin/master'

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementCostServiceImpl.java

@@ -2,6 +2,7 @@ package com.jzg.organization.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -320,6 +321,9 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
 
 
     public static boolean isValid(String effectiveTime, String failureTime) {
+        if (StrUtil.isBlank(effectiveTime) || StrUtil.isBlank(failureTime)){
+            return false;
+        }
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime start = LocalDateTime.parse(effectiveTime,
                 DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));