diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonDTO.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonDTO.java index 76c8de8..ef442b9 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonDTO.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonDTO.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.register.dto; import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.Person; import lombok.Data; import org.springframework.beans.BeanUtils; @@ -30,9 +31,15 @@ public static PersonDTO personToDTO(Person person){ PersonDTO personDTO = new PersonDTO(); BeanUtils.copyProperties(person,personDTO); - personDTO.setCreatetime(DateUtil.getTime(person.getCreatetime())); - personDTO.setUpdatetime(DateUtil.getTime(person.getUpdatetime())); - personDTO.setBirthday(DateUtil.getDay(person.getBirthday())); + if(ToolUtil.isNotEmpty(person.getCreatetime())){ + personDTO.setCreatetime(DateUtil.getTime(person.getCreatetime())); + } + if(ToolUtil.isNotEmpty(person.getUpdatetime())){ + personDTO.setUpdatetime(DateUtil.getTime(person.getUpdatetime())); + } + if(ToolUtil.isNotEmpty(person.getBirthday())){ + personDTO.setBirthday(DateUtil.getDay(person.getBirthday())); + } return personDTO; } }