Merge branch 'develop'

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java

@@ -3429,20 +3429,19 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 							tPreEmployeeInfo.setPoliticalStatus(info.getPoliticalStatusValue());
 							tPreEmployeeInfo.setEmpEmail(info.getEmpEmail());
 							tPreEmployeeInfo.setEmpPhone(info.getEmpPhone());
+							// 2024-10-30 20:02:53 测试jld认为如果没写户籍省，则带出档案。我认为有道理
 							if (Common.isNotNull(info.getIdProvinceValue())) {
 								tPreEmployeeInfo.setIdProvince(Integer.parseInt(info.getIdProvinceValue()));
-							} else {
-								tPreEmployeeInfo.setIdProvince(null);
-							}
-							if (Common.isNotNull(info.getIdCityValue())) {
-								tPreEmployeeInfo.setIdCity(Integer.parseInt(info.getIdCityValue()));
-							} else {
-								tPreEmployeeInfo.setIdCity(null);
-							}
-							if (Common.isNotNull(info.getIdTownValue())) {
-								tPreEmployeeInfo.setIdTown(Integer.parseInt(info.getIdTownValue()));
-							} else {
-								tPreEmployeeInfo.setIdTown(null);
+								if (Common.isNotNull(info.getIdCityValue())) {
+									tPreEmployeeInfo.setIdCity(Integer.parseInt(info.getIdCityValue()));
+								} else {
+									tPreEmployeeInfo.setIdCity(null);
+								}
+								if (Common.isNotNull(info.getIdTownValue())) {
+									tPreEmployeeInfo.setIdTown(Integer.parseInt(info.getIdTownValue()));
+								} else {
+									tPreEmployeeInfo.setIdTown(null);
+								}
 							}
 							tPreEmployeeInfo.setEmpRegisType(info.getEmpRegisTypeValue());
 							if (Common.isNotNull(info.getFileProvinceValue())) {