From a180c14ebe5560244f451831d4009423f392369f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 30 十月 2024 21:53:59 +0800
Subject: [PATCH] bug
---
src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java | 12 +++++++-----
src/main/java/com/ycl/jxkg/domain/vo/admin/education/EducationResourceVO.java | 4 ++--
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/EducationResourceVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/EducationResourceVO.java
index 1a1f602..4f24c59 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/EducationResourceVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/EducationResourceVO.java
@@ -56,10 +56,10 @@
private Integer createUser;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private String visitUrl;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java
index 909cc65..c2f488b 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java
@@ -75,11 +75,13 @@
user.setPhone(form.getPhone());
user.setRealName(form.getRealName());
user.setSex(form.getSex());
- DateFormat fmt =new SimpleDateFormat("yyyy-MM-dd");
- try {
- user.setBirthDay(fmt.parse(form.getBirthDay()));
- } catch (ParseException e) {
- throw new RuntimeException(e);
+ if (StringUtils.hasText(form.getBirthDay())) {
+ DateFormat fmt =new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ user.setBirthDay(fmt.parse(form.getBirthDay()));
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
}
user.setLastUpdatePasswordTime(new Date());
userMapper.insert(user);
--
Gitblit v1.8.0