根据身份证号自动匹配照片

src/main/java/com/template/controller/WelcomeStudentController.java

@@ -1139,7 +1139,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         String nativePlace = dataFormatter.formatCellValue(row.getCell(15));//籍贯
                         String[] addressDatas = nativePlace.split("/");
                         if (citys != null && citys.size() > 0) {
-                            if (addressDatas != null && addressDatas.length >= 1) {
+                            if (addressDatas != null && addressDatas.length >= 1 && StringUtils.hasText(nativePlace)) {
                                 if (!addressDatas[0].contains("省")) {
                                     return CommonResult.fail("录取编号为\" + assNum + \"的籍贯格式应该是 省/市/县");
                                 }
@@ -1176,7 +1176,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         String addressPlace = dataFormatter.formatCellValue(row.getCell(16));//家庭住址
                         String[] addressPlaces = addressPlace.split("/");
                         if (citys != null && citys.size() > 0) {
-                            if (addressPlaces != null && addressPlaces.length >= 1) {
+                            if (addressPlaces != null && addressPlaces.length >= 1 && StringUtils.hasText(addressPlace)) {
                                 if (!addressPlaces[0].contains("省")) {
                                     return CommonResult.fail("录取编号为" + assNum + "的家庭住址格式应该是 省/市/县区");
                                 }
@@ -1216,7 +1216,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         studentData.setZipCode(zipCode);
                         studentData.setIdenType(1);
                         studentData.setFillStatus("未填报");
-                        studentData.setPicture("https://chtech.ncjti.edu.cn/welcome/homeimage/newStudentHeadImage.jpg");
+                        //studentData.setPicture("https://chtech.ncjti.edu.cn/welcome/homeimage/newStudentHeadImage.jpg");
+                        studentData.setPicture("https://chtech.ncjti.edu.cn/welcome/homeimage/studentImage/"+studentData.getCardId()+".jpg");
                         result.add(studentData);
                     }
                 }
@@ -1421,7 +1422,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         String nativePlace = dataFormatter.formatCellValue(row.getCell(15));//籍贯
                         String[] addressDatas = nativePlace.split("/");
                         if (citys != null && citys.size() > 0) {
-                            if (addressDatas != null && addressDatas.length >= 1) {
+                            if (addressDatas != null && addressDatas.length >= 1 && StringUtils.hasText(nativePlace)) {
                                 if (!addressDatas[0].contains("省")) {
                                     return CommonResult.fail("录取编号为\" + assNum + \"的籍贯格式应该是 省/市/县区");
                                 }
@@ -1458,7 +1459,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         String addressPlace = dataFormatter.formatCellValue(row.getCell(16));//家庭住址
                         String[] addressPlaces = addressPlace.split("/");
                         if (citys != null && citys.size() > 0) {
-                            if (addressPlaces != null && addressPlaces.length >= 1) {
+                            if (addressPlaces != null && addressPlaces.length >= 1 && StringUtils.hasText(addressPlace)) {
                                 if (!addressPlaces[0].contains("省")) {
                                     return CommonResult.fail("录取编号为" + assNum + "的家庭住址格式应该是 省/市/县区");
                                 }
@@ -1498,7 +1499,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         studentData.setZipCode(zipCode);
                         studentData.setIdenType(1);
                         studentData.setFillStatus("未填报");
-                        studentData.setPicture("https://chtech.ncjti.edu.cn/welcome/homeimage/newStudentHeadImage.jpg");
+                        //studentData.setPicture("https://chtech.ncjti.edu.cn/welcome/homeimage/newStudentHeadImage.jpg");
+                        studentData.setPicture("https://chtech.ncjti.edu.cn/welcome/homeimage/studentImage/"+studentData.getCardId()+".jpg");
                         result.add(studentData);
                     }
                 }