测试问题修改

web/src/main/java/com/jpsoft/employment/modules/base/controller/PersonInfoController.java

@@ -273,7 +273,7 @@ public class PersonInfoController {
             int sheetIndex = 0;
             Sheet sheet1 = poiUtils.getSheetAt(sheetIndex);
 
-            String[] colNames = new String[]{"用户名","真实姓名","联系电话","身份证号","年龄","性别"};
+            String[] colNames = new String[]{"用户名","真实姓名","联系电话","身份证号"};
             Map<String,Integer> headerMap = new HashMap<>();
 
             Row headerRow = sheet1.getRow(0);
@@ -324,18 +324,6 @@ public class PersonInfoController {
                         idCard = poiUtils.getCellValue(sheetIndex,rowIndex,headerMap.get("身份证号")).toString().replace(" ","");
                     }
 
-                    String age = "";
-
-                    if(headerMap.containsKey("年龄")){
-                        age = poiUtils.getCellValue(sheetIndex,rowIndex,headerMap.get("年龄")).toString().replace(" ","");
-                    }
-
-                    String gender = "";
-
-                    if(headerMap.containsKey("性别")){
-                        gender = poiUtils.getCellValue(sheetIndex,rowIndex,headerMap.get("性别")).toString().replace(" ","");
-                    }
-
 
                     if(StringUtils.isEmpty(userName)){
                         sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("未填写用户名!");
@@ -363,17 +351,6 @@ public class PersonInfoController {
                         continue;
                     }
 
-                    if(StringUtils.isEmpty(age)){
-                        sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("未填写年龄!");
-                        failCount++;
-                        continue;
-                    }
-
-                    if(StringUtils.isEmpty(gender)){
-                        sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("未填写性别!");
-                        failCount++;
-                        continue;
-                    }
 
 //                    String platform = "";
 //
@@ -390,14 +367,6 @@ public class PersonInfoController {
                     personInfo.setUserName(userName);
                     personInfo.setRealName(realName);
                     personInfo.setIdCard(idCard);
-                    personInfo.setAge(Integer.parseInt(age));
-
-                    if("男".equals(gender)){
-                        personInfo.setGender("0");
-                    }
-                    else if("女".equals(gender)){
-                        personInfo.setGender("1");
-                    }
                     personInfo.setStatus("0");
                     personInfo.setCreateBy(subject);
                     personInfo.setCreateTime(new Date());

web/src/main/java/com/jpsoft/employment/modules/base/controller/TrainingInfoController.java

@@ -59,7 +59,7 @@ public class TrainingInfoController {
             trainingInfo.setCreateTime(new Date());
             trainingInfo.setStatus("0");
 
-            if (trainingInfo.getFileList().size() > 0) {
+            if (trainingInfo.getFileList() != null && trainingInfo.getFileList().size() > 0) {
                 List<FileDTO> fileList = trainingInfo.getFileList();
 
                 JSONArray jsonArray = JSONArray.fromObject(fileList);
@@ -139,7 +139,7 @@ public class TrainingInfoController {
             trainingInfo.setUpdateBy(subject);
             trainingInfo.setUpdateTime(new Date());
 
-            if (trainingInfo.getFileList().size() > 0) {
+            if (trainingInfo.getFileList() != null && trainingInfo.getFileList().size() > 0) {
                 List<FileDTO> fileList = trainingInfo.getFileList();
 
                 JSONArray jsonArray = JSONArray.fromObject(fileList);