|
@@ -1,6 +1,7 @@
|
|
|
package com.boman.web.core.service.fieldTranslator;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.boman.common.core.utils.StringUtils;
|
|
|
import com.boman.common.core.utils.fieldTranslator.IdCardUtils;
|
|
|
import com.boman.common.core.utils.obj.ObjectUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -18,11 +19,11 @@ public class FieldTranslatorServiceImpl implements IFieldTranslatorService{
|
|
|
public JSONObject idCardTranslator(JSONObject commitData) {
|
|
|
Object idCard = commitData.get("id_card");
|
|
|
Set<String> columnNameSet = commitData.keySet();
|
|
|
- if (columnNameSet.contains("birthday_user")){
|
|
|
+ if (columnNameSet.contains("birthday_user") && StringUtils.isBlank(String.valueOf(commitData.get("birthday_user")))){
|
|
|
String birthday = IdCardUtils.getBirthday(String.valueOf(idCard));
|
|
|
commitData.put("birthday_user",birthday);
|
|
|
}
|
|
|
- if (columnNameSet.contains("gender_user")){
|
|
|
+ if (columnNameSet.contains("gender_user") && StringUtils.isBlank(String.valueOf(commitData.get("gender_user")))){
|
|
|
String sex = IdCardUtils.getSex(String.valueOf(idCard));
|
|
|
commitData.put("gender_user",sex);
|
|
|
}
|