修改导入

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wsstaff/service/WsStaffService.java

@@ -269,7 +269,7 @@ public class WsStaffService extends CrudService<WsStaffMapper, WsStaff> {
 				}
 
 				//前五个参数（第四个银行卡号除外）+第八个参数必填
-				if (result[i][0].trim()==""||result[i][0].trim()==null || result[i][1].trim()==""||result[i][1].trim()==null || result[i][2].trim()==""||result[i][2].trim()==null ||  result[i][4].trim()==""||result[i][4].trim()==null || result[i][7].trim()==""||result[i][7].trim()==null) {
+				if (result[i][0].trim()==""||result[i][0].trim()==null || result[i][1].trim()==""||result[i][1].trim()==null || result[i][2].trim()==""||result[i][2].trim()==null  || result[i][7].trim()==""||result[i][7].trim()==null) {
 					failureNum++;
 					if (StringUtils.isNotBlank(errorRequiredIndexs)) {
 						errorRequiredIndexs.append("," + (i+1));
@@ -277,6 +277,16 @@ public class WsStaffService extends CrudService<WsStaffMapper, WsStaff> {
 						errorRequiredIndexs.append(i+1);
 					}
 					continue;
+				}else{
+					if(StringUtils.isNotBlank(result[i][3].trim()) && StringUtils.isBlank(result[i][4].trim())){
+						failureNum++;
+						if (StringUtils.isNotBlank(errorRequiredIndexs)) {
+							errorRequiredIndexs.append("," + (i+1));
+						} else {
+							errorRequiredIndexs.append(i+1);
+						}
+						continue;
+					}
 				}
 
 				//校验入离职格式