修改人员导入bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -801,6 +801,11 @@ public class ExcelServiceImpl {
 						formItemDescr.setFieldValue(null);
 						DynamicFormInitDto.setFormItemDescr(formItemDescr);
 					}
+					if ("gender".equals(DynamicFormInitDto.getKey())){
+						DynamicFormInstanceDto formItemDescr = DynamicFormInitDto.getFormItemDescr();
+						formItemDescr.setFieldValue(null);
+						DynamicFormInitDto.setFormItemDescr(formItemDescr);
+					}
 					dynamicFormValue.add(DynamicFormInitDto.getFormItemDescr());
 				});
 				dynamicFormValue.forEach(dynamicFormInstanceDto -> {
@@ -837,13 +842,13 @@ public class ExcelServiceImpl {
 					if (map1.containsKey(fieldCode.substring(0,fieldCode.length()-4))){
 						dynamicFormInstance.setFieldValueLabel(map1.get(fieldCode.substring(0,fieldCode.length()-4)).toString());
 					}
-					if ("gender".equals(dynamicFormInstance.getFieldCode())){
+					if ("gender".equals(dynamicFormInstance.getFieldCode()) && !ObjectUtils.isEmpty(dynamicFormInstance.getFieldValue())){
 						dynamicFormInstance.setFieldValueLabel("346".equals(String.valueOf(dynamicFormInstance.getFieldValue()))?"男":"女");
 					}
-					if ("positionType".equals(dynamicFormInstance.getFieldCode())){
+					if ("positionType".equals(dynamicFormInstance.getFieldCode()) && !ObjectUtils.isEmpty(dynamicFormInstance.getFieldValue())){
 						dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName());
 					}
-					if ("certificatesTypeCode".equals(fieldCode)){
+					if ("certificatesTypeCode".equals(fieldCode) && !ObjectUtils.isEmpty(map1.get(fieldCode))){
 						String[] split = map1.get(fieldCode).toString().split("@");
 						dynamicFormInstance.setFieldValue(split[1]);
 						dynamicFormInstance.setFieldValueLabel(split[0]);}
@@ -863,15 +868,16 @@ public class ExcelServiceImpl {
 				orgUsrExcelDto.setDynamicFormValue(dynamicFormInstancelist);
 				Bean.toPo(getCurrentInfo(), orgUsrExcelDto);
 				// 保存动态表单和人员单位表
-
-				String[] split55 = orgUsrExcelDto.getCertificatesTypeCode().toString().split("@");
-				if (!ObjectUtils.isEmpty(orgUsrExcelDto.getCertificatesNumber())&&split55[1].equals("120")) {
-					if (!set.add(orgUsrExcelDto.getCertificatesNumber())) {
-						throw new RuntimeException("身份证号码重复!");
-					} else {
-						boolean b = orgUsrService.checkCertificatesNumber(orgUsrExcelDto.getCertificatesNumber(), null);
-						if (b) {
+				if (!ObjectUtils.isEmpty(orgUsrExcelDto.getCertificatesTypeCode())){
+					String[] split55 = orgUsrExcelDto.getCertificatesTypeCode().toString().split("@");
+					if (!ObjectUtils.isEmpty(orgUsrExcelDto.getCertificatesNumber())&&split55[1].equals("120")) {
+						if (!set.add(orgUsrExcelDto.getCertificatesNumber())) {
 							throw new RuntimeException("身份证号码重复!");
+						} else {
+							boolean b = orgUsrService.checkCertificatesNumber(orgUsrExcelDto.getCertificatesNumber(), null);
+							if (b) {
+								throw new RuntimeException("身份证号码重复!");
+							}
 						}
 					}
 				}