diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringAnnexController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringAnnexController.java index 8236628..ef16afb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringAnnexController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringAnnexController.java @@ -188,6 +188,7 @@ public class GovEngineeringAnnexController { } else { engineeringAnnex.setAnnexFileList(annexFileService.list(Wrappers.lambdaQuery() .eq(AnnexFile::getRelevanceId, engineeringAnnex.getEngineeringSn()) + .eq(AnnexFile::getLabel, engineeringAnnex.getId()) .eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.ENGINEERING_ANNEX.getValue()))); result.setResult(engineeringAnnex); result.setSuccess(true); @@ -204,11 +205,13 @@ public class GovEngineeringAnnexController { @PostMapping(value = "/batchUpdateFile") public Result batchUpdateFile(@RequestBody EngineeringAnnex engineeringAnnex) { annexFileService.remove(Wrappers.lambdaQuery() + .eq(AnnexFile::getLabel, engineeringAnnex.getId()) .eq(AnnexFile::getRelevanceId, engineeringAnnex.getEngineeringSn()) .eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.ENGINEERING_ANNEX.getValue())); for (AnnexFile annexFile : engineeringAnnex.getAnnexFileList()) { annexFile.setRelevanceId(engineeringAnnex.getEngineeringSn()); annexFile.setFileType(ParamEnum.AnnexFileType.ENGINEERING_ANNEX.getValue()); + annexFile.setLabel(engineeringAnnex.getId().toString()); } annexFileService.saveBatch(engineeringAnnex.getAnnexFileList()); return Result.success(true);