1

src/main/java/com/chinaitop/depot/basic/service/impl/BasicKeeperServiceImpl.java

@@ -317,19 +317,19 @@ public class BasicKeeperServiceImpl implements BasicKeeperService {
 		//更新子表数据
 		//学历学位信息1
 		List<BasicKeeperEducation> xlxwList = mappers.readValue(xwxlJson, new TypeReference<List<BasicKeeperEducation>>(){});
-		editEducation(xlxwList, id, basicKeeper.getOrgId());
+		editEducation(xlxwList, id, basicKeeper.getOrgId(), 1);
 		//技能等级2
 		List<BasicKeeperEducation> zyjsList = mappers.readValue(zyjsJson, new TypeReference<List<BasicKeeperEducation>>(){});
-		editEducation(zyjsList, id, basicKeeper.getOrgId());
+		editEducation(zyjsList, id, basicKeeper.getOrgId(), 2);
 		//职称和荣誉称号3
 		List<BasicKeeperEducation> zyzgList = mappers.readValue(zyzgJson, new TypeReference<List<BasicKeeperEducation>>(){});
-		editEducation(zyzgList, id, basicKeeper.getOrgId());
+		editEducation(zyzgList, id, basicKeeper.getOrgId(), 3);
 		//上岗证4
 		List<BasicKeeperEducation> sgzList = mappers.readValue(sgzJson, new TypeReference<List<BasicKeeperEducation>>(){});
-		editEducation(sgzList, id, basicKeeper.getOrgId());
+		editEducation(sgzList, id, basicKeeper.getOrgId(), 4);
 		//交流轮岗5
 		List<BasicKeeperEducation> jllgList = mappers.readValue(jllgJson, new TypeReference<List<BasicKeeperEducation>>(){});
-		editEducation(jllgList, id, basicKeeper.getOrgId());
+		editEducation(jllgList, id, basicKeeper.getOrgId(), 5);
 
 	}
 
@@ -340,33 +340,32 @@ public class BasicKeeperServiceImpl implements BasicKeeperService {
 	 * @param id
 	 */
 	@Transactional(rollbackFor = Exception.class)
-	public void editEducation(List<BasicKeeperEducation> edcationList, Integer id, Integer orgId) {
-		Integer dataType = 0; //数据类型
+	public void editEducation(List<BasicKeeperEducation> edcationList, Integer id, Integer orgId, Integer datatype) {
 		for (BasicKeeperEducation bke : edcationList) {
 			if (null == bke.getId() || "".equals(bke.getId())) {
 				bke.setKeeperId(id);
-				dataType = bke.getDatatype();
-				if ("1".equals(dataType) || dataType == 1) {//学历
+				bke.setDatatype(datatype);
+				if ("1".equals(datatype) || datatype == 1) {//学历
 //					Integer education = bke.getEducation();
 //					if (education == null) {
 //						continue;
 //					}
-				} else if ("2".equals(dataType) || dataType == 2) {//技能等级
+				} else if ("2".equals(datatype) || datatype == 2) {//技能等级
 					String departMent = bke.getDepartment();
 					if (departMent == null || "".equals(departMent)) {
 						continue;
 					}
-				} else if ("3".equals(dataType) || dataType == 3) {//职称和荣誉称号
+				} else if ("3".equals(datatype) || datatype == 3) {//职称和荣誉称号
 					String departMent = bke.getDepartment();
 					if (departMent == null || "".equals(departMent)) {
 						continue;
 					}
-				} if ("4".equals(dataType) || dataType == 3) {//上岗证
+				} if ("4".equals(datatype) || datatype == 3) {//上岗证
 					String departMent = bke.getDepartment();
 					if (departMent == null || "".equals(departMent)) {
 						continue;
 					}
-				} else if ("5".equals(dataType) || dataType == 5) {//交流轮岗
+				} else if ("5".equals(datatype) || datatype == 5) {//交流轮岗
 					String fzywlx = bke.getFzywlx();
 					if (fzywlx == null) {
 						continue;