Merge branch 'dev_personal_center' into dev_temp

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java

@@ -253,6 +253,7 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         //wrapper
         QueryWrapper<UserAdviceEntity> wrapper = new QueryWrapper<>();
         //del_flag
+
         wrapper.eq("DEL_FLAG","0");
         //客户Id
         wrapper.eq(StringUtils.isNotBlank(dto.getCustomerId()), "CUSTOMER_ID", dto.getCustomerId());
@@ -268,9 +269,9 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         wrapper.like(StringUtils.isNotBlank(dto.getAdviceType()), "ADVICE_TYPE", dto.getAdviceType());
 
         //开始时间
-        wrapper.ge(dto.getStartTime() != null, "CREATED_TIME", dto.getStartTime());
+        wrapper.ge(StringUtils.isNotBlank(dto.getStartTime()), "CREATED_TIME", dto.getStartTime());
         //结束时间
-        wrapper.le(dto.getEndTime() != null, "CREATED_TIME", dto.getEndTime());
+        wrapper.le(StringUtils.isNotBlank(dto.getEndTime()), "CREATED_TIME", dto.getEndTime());
         // 组织id
         if (StringUtils.isNotBlank(dto.getAgencyId())){
             wrapper.and(wrapper1 ->wrapper1.eq("AGENCY_ID", dto.getAgencyId())