Merge remote-tracking branch 'remotes/origin/dev_data_update_config' into 烟台-政务master

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java

@@ -224,9 +224,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                         e.setIsResiUser(StringUtils.isBlank(idCard.getUserId()) ? NumConstant.ZERO_STR : NumConstant.ONE_STR);
                         e.setUserId(idCard.getUserId());
                         e.setUserType("sync");
-                        e.setName(natInfo.getName());
-                        e.setMobile(natInfo.getTelephone());
-                        e.setIdCard(natInfo.getCard_no());
+                        e.setName(StringUtils.isNotBlank(natInfo.getName()) ? natInfo.getName() : "");
+                        e.setMobile(StringUtils.isNotBlank(natInfo.getTelephone()) ? natInfo.getTelephone() : "");
+                        e.setIdCard(StringUtils.isNotBlank(natInfo.getCard_no()) ? natInfo.getCard_no() : "");
                         e.setNatTime(DateUtils.parseDate(natInfo.getTest_time(),DateUtils.DATE_TIME_PATTERN));
                         e.setNatResult(natInfo.getSample_result_pcr());
                         e.setNatAddress(natInfo.getSampling_org_pcr());