|
@@ -163,7 +163,9 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
|
|
|
user.setToMerchantMakerTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
|
|
user.setToMerchantMakerTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
|
|
|
break;
|
|
break;
|
|
|
case "LogOutDate":
|
|
case "LogOutDate":
|
|
|
- user.setUpdateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
|
|
|
|
|
|
|
+ if(fieldDataMap.get(field) != null){
|
|
|
|
|
+ user.setUpdateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
|
|
|
|
|
+ }
|
|
|
break;
|
|
break;
|
|
|
case "CreateDate":
|
|
case "CreateDate":
|
|
|
user.setCreateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
|
|
user.setCreateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
|