修改bug 人員崗位和學歷多次保存的問題

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersPostController.java

@@ -66,6 +66,7 @@ public class FirefightersPostController extends BaseController {
 	 * 
 	 * @return
 	 */
+	@SuppressWarnings("unchecked")
 	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "新增岗位信息", notes = "新增岗位信息")
@@ -73,8 +74,11 @@ public class FirefightersPostController extends BaseController {
 	public ResponseModel<Object> saveFirefightersPost(@RequestBody FirefightersDataDto firefightersDataDto) {
 		try {
 			/*---------修改bug:2179   解決崗位与学历可以重复添加导致的列表页展示消防人员信息呈现多条的情况  on 2021-08-21 陈浩---start*/
-			LambdaQueryWrapper<FirefightersPost> queryWrapper = new LambdaQueryWrapper<FirefightersPost>();
-			queryWrapper.eq(FirefightersPost::getFirefightersId, firefightersDataDto.getFirefightersPost().getFirefightersId());
+			//LambdaQueryWrapper<FirefightersPost> queryWrapper = new LambdaQueryWrapper<FirefightersPost>();
+			//.eq(FirefightersPost::getFirefightersId, firefightersDataDto.getFirefightersPost().getFirefightersId());
+			@SuppressWarnings("rawtypes")
+			QueryWrapper queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("firefighters_id", firefightersDataDto.getFirefightersPost().getFirefightersId());
 			FirefightersPost firefightersPost = iFirefightersPostService.getOne(queryWrapper);
 
 			if (firefightersPost == null) {
@@ -82,10 +86,21 @@ public class FirefightersPostController extends BaseController {
 			} else {
 				iFirefightersPostService.update(firefightersDataDto.getFirefightersPost(), queryWrapper);
 			}
-			// iFirefightersPostService.save(firefightersDataDto.getFirefightersPost());
+			
+			FirefightersEducation firefightersEducation=	ifirefightersEducationService.getOne(queryWrapper);
+			if(firefightersEducation==null) {
+				ifirefightersEducationService.save(firefightersDataDto.getFirefightersEducation());
+			}else {
+				ifirefightersEducationService.update(firefightersDataDto.getFirefightersEducation(),queryWrapper);
+			}
+			
+			FirefightersWorkexperience  firefightersWorkexperience =	ifirefightersWorkexperienceService.getOne(queryWrapper);
+			if(firefightersWorkexperience==null) {
+				ifirefightersWorkexperienceService.save(firefightersDataDto.getFirefightersWorkexperience());
+			}else {
+				ifirefightersWorkexperienceService.update(firefightersDataDto.getFirefightersWorkexperience(),queryWrapper);
+			}
 			/*---------修改bug:2179   解決崗位与学历可以重复添加导致的列表页展示消防人员信息呈现多条的情况  on 2021-08-21 陈浩---end*/
-			ifirefightersWorkexperienceService.save(firefightersDataDto.getFirefightersWorkexperience());
-			ifirefightersEducationService.save(firefightersDataDto.getFirefightersEducation());
 			return ResponseHelper.buildResponse(null);
 		} catch (Exception e) {