From 75b0084e62f6979949ac58f59bbbbe2c09d748da Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 22 Jan 2019 16:54:44 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][ID1000796][=E6=8E=92=E5=BA=8F=E5=8F=8A?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E6=B4=BB=E8=B7=83=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=8E=E6=B3=A8=E5=86=8C=E6=97=B6=E9=97=B4=E7=9A=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 0a25e835e..2776ce300 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -526,14 +526,16 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { oldUserBase.setEducation(userBase.getEducation()); oldUserBase.setBirthdate(userBase.getBirthdate()); oldUserBase.setAddress(userBase.getAddress()); - oldUserBase.setUpdateDate(new Date()); - oldUserBase.setCreateDate(userBase.getCreateDate()); + oldUserBase.setUpdateDate(userBase.getUpdateDate() == null ? new Date() : userBase.getUpdateDate()); + oldUserBase.setCreateDate(userBase.getCreateDate() == null ? oldUserBase.getCreateDate() : userBase.getCreateDate()); // 成长值 if(points != null) { oldUserBase.setPoins(points); } } else { userBase.setId(idWorker.nextId()); + userBase.setUpdateDate(userBase.getUpdateDate() == null ? new Date() : userBase.getUpdateDate()); + userBase.setCreateDate(userBase.getCreateDate() == null ? new Date() : userBase.getCreateDate()); } // update 昵称