修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -151,10 +151,10 @@ LEFT JOIN cb_firefighters_education fe ON f.sequence_nbr = fe.firefighters_id
 LEFT JOIN cb_firefighters_post fp ON f.sequence_nbr = fp.firefighters_id
 WHERE
 	f.is_delete = 0
-AND fc.is_delete = 0
-AND fw.is_delete = 0
-AND fe.is_delete = 0
-AND fp.is_delete = 0
+-- AND fc.is_delete = 0
+-- AND fw.is_delete = 0
+-- AND fe.is_delete = 0
+-- AND fp.is_delete = 0
 	</select>
 
 	<select id="getFirefightersName" resultType="string">

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

@@ -642,6 +642,11 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
 				String[] employeeHierarchy = item.getHighestEducation().split("@");
 				firefightersEducation.setHighestEducation(employeeHierarchy[1]);
 			}
+			if (item.getAcademicDegree()!= null) {
+				String[] employeeHierarchy = item.getAcademicDegree().split("@");
+				firefightersEducation.setAcademicDegree(employeeHierarchy[1]);
+			}
+
 			iFirefightersPostService.save(firefightersPost);
 			ifirefightersEducationService.save(firefightersEducation);
 			ifirefightersWorkexperienceService.save(firefightersWorkexperience);