Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -2791,7 +2791,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			saveFirefightersContacts(peopleInfoDto);
 		}
 		// 4.保存岗位信息
-		saveFirefightersPost(peopleInfoDto.getPostEduDtoObj(), orgUsr.getSequenceNbr());
+		saveFirefightersPost(peopleInfoDto.getPostEduDtoObj(), orgUsrDto.getSequenceNbr());
 		return peopleInfoDto;
 	}
 
@@ -3069,7 +3069,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 
 		// 2. 删除岗位页签
-		deleteFirefightersPost(id);
+		deleteFirefightersPost(String.valueOf(id));
 
 		// 3.根据type是否删除消防人员
 		if ("2".equals(type)) {
@@ -3117,7 +3117,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 	}
 
-	public void deleteFirefightersPost(Long id){
+	public void deleteFirefightersPost(String id){
 		iFirefightersPostService
 				.update(new UpdateWrapper<FirefightersPost>().eq("org_usr_id", id).set("is_delete", 1));
 		ifirefightersContactsService