出生日期字段丢失

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -3,16 +3,9 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
@@ -2938,31 +2931,32 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				formValue -> !ObjectUtils.isEmpty(formValue.getValue()) ? formValue.getValue() : ""));
 		// 获取对象属性和值
 		Field[] fields = peopleBasicInfoDto.getClass().getDeclaredFields();
-		Object birthdayTimeValue = null;
 		for (Field field : fields) {
 			try{
 				field.setAccessible(true);
 				String name = field.getName();
-				if("birthdayTime".equals(name)){
-					birthdayTimeValue = collect.get(name);
-				}
 				Object value = collect.get(name);
+				String genericType = ((Class)field.getGenericType()).getSimpleName();
+				if ("Date".equals(genericType)) {
+					if (!ObjectUtils.isEmpty(value)) {
+						Date date;
+						SimpleDateFormat ft = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
+						try {
+							date = ft.parse(value.toString());
+							field.set(peopleBasicInfoDto, date);
+						} catch (Exception e) {
+							logger.error("日期转换失败");
+						}
+					}
+				} else {
 					field.set(peopleBasicInfoDto, value);
+				}
 			} catch (Exception ex){
 				logger.error("获取{}字段值失败, {}", field.getName(), ex);
 			}
 		}
 
-//		if (!ObjectUtils.isEmpty(birthdayTimeValue)) {
-//			Date date;
-//			SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//			try {
-//				date = ft.parse(birthdayTimeValue.toString());
-//				peopleBasicInfoDto.setBirthdayTime(date);
-//			} catch (ParseException e) {
-//				logger.error("日期转换失败");
-//			}
-//		}
+
 
 		if (!ObjectUtils.isEmpty(orgUsr.getSequenceNbr())) {
 			peopleBasicInfoDto.setName(orgUsr.getBizOrgName());