diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java index 1f2b369..e632f51 100644 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java +++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java @@ -69,13 +69,21 @@ public class CmsWebsiteServiceImplHelper { vo.setRunning(website.getRunning()); vo.setVersion(website.getVersion()); if (website.getCreateTime() != null) { - vo.setCreateTime(website.getCreateTime().format(formatter)); + // 将Date转换为LocalDateTime后格式化 + LocalDateTime createTime = website.getCreateTime().toInstant() + .atZone(java.time.ZoneId.systemDefault()) + .toLocalDateTime(); + vo.setCreateTime(createTime.format(formatter)); } // 时间字段 - 格式化为字符串 -// if (website.getExpirationTime() != null) { -// vo.setExpirationTime(website.getExpirationTime().format(formatter)); -// } + if (website.getExpirationTime() != null) { + // 将Date转换为LocalDateTime后格式化 + LocalDateTime expirationTime = website.getExpirationTime().toInstant() + .atZone(java.time.ZoneId.systemDefault()) + .toLocalDateTime(); + vo.setExpirationTime(expirationTime.format(formatter)); + } // 过期相关信息 vo.setExpired(website.getExpired()); diff --git a/src/main/java/com/gxwebsoft/oa/controller/OaAppController.java b/src/main/java/com/gxwebsoft/oa/controller/OaAppController.java index 35d6640..001c3f8 100644 --- a/src/main/java/com/gxwebsoft/oa/controller/OaAppController.java +++ b/src/main/java/com/gxwebsoft/oa/controller/OaAppController.java @@ -76,7 +76,7 @@ public class OaAppController extends BaseController { if(!StrUtil.equals(d.getRoleCode(),"superAdmin") && !StrUtil.equals(d.getRoleCode(),"admin")){ // 非管理员按项目成员权限显示 final List list = oaAppUserService.list(new LambdaQueryWrapper().eq(OaAppUser::getUserId, userId)); - System.out.println("list = " + list); + System.out.println("非管理员按项目成员权限显示 list = " + list); final Set collect = list.stream().map(OaAppUser::getAppId).collect(Collectors.toSet()); param.setAppIds(collect); } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderCancelServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderCancelServiceImpl.java index 603e267..825afbb 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/OrderCancelServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/OrderCancelServiceImpl.java @@ -126,7 +126,7 @@ public class OrderCancelServiceImpl implements OrderCancelService { .last("LIMIT " + batchSize); final List list = shopOrderService.list(queryWrapper); - System.out.println("list = " + list.size()); + System.out.println("定时任务需要查询所有租户的超时订单 list = " + list.size()); return shopOrderService.list(queryWrapper); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8232c29..4888d93 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -26,9 +26,6 @@ spring: write-dates-as-timestamps: false deserialization: fail-on-unknown-properties: false - # 启用JSR310模块支持Java 8时间类型 - modules: - - com.fasterxml.jackson.datatype.jsr310.JavaTimeModule # 连接池配置 datasource: