From c6d95d55816978a17b7b454ceeb8484af5b09d2b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 31 Jan 2024 10:53:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=2079844=20=E8=BD=A6=E5=9E=8B=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E9=A1=B9=E7=9B=AE=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectLibrary/controller/LawsAssessController.java   | 8 +++++---
 .../service/impl/LawsAssessServiceImpl.java               | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java
index e1fa021e..9cb7094b 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java
@@ -167,14 +167,15 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 	 @ApiOperation(value="车型项目库-法规清单-复制", notes="车型项目库-法规清单-复制")
 	 @PostMapping(value = "/copy")
 	 public Result<T> copy(@Validated @RequestBody LawsAssessAddVo lawsAssessAddVo) {
+		 String projectId = lawsAssessAddVo.getProjectId();
 		 String copyProjectId = lawsAssessAddVo.getCopyProjectId();
 		 if (StringUtils.isBlank(copyProjectId)){
 			 throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
 		 }
 		 Date now = new Date();
 		 List<LawsAssess> lawsAssesses = new ArrayList<>();
-		 List<LawsAssess> allByProjectIdNotDeleted = lawsAssessService.getAllByProjectIdNotDeleted(lawsAssessAddVo.getProjectId());
-		 List<LawsAssess> allByProjectIdDeleted = lawsAssessService.getAllByProjectIdDeleted(lawsAssessAddVo.getProjectId());
+		 List<LawsAssess> allByProjectIdNotDeleted = lawsAssessService.getAllByProjectIdNotDeleted(projectId);
+		 List<LawsAssess> allByProjectIdDeleted = lawsAssessService.getAllByProjectIdDeleted(projectId);
 		 List<String> allByProjectIdNotDeletedIdList = allByProjectIdNotDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList());
 		 List<String> allByProjectIdDeletedIdList = allByProjectIdDeleted.stream().map(LawsAssess::getStandardId).distinct().collect(Collectors.toList());
 		 //获取要拷贝项目的未删除标准
@@ -194,13 +195,14 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
 			 }
 			 LawsAssess assess = new LawsAssess();
 			 assess.setSource(lawsAssess.getSource());
-			 assess.setProjectId(lawsAssessAddVo.getProjectId());
+			 assess.setProjectId(projectId);
 			 assess.setStandardId(standardId);
 			 assess.setStandardNumber(lawsAssess.getStandardNumber());
 			 assess.setStandardName(lawsAssess.getStandardName());
 			 assess.setProcessStatus(AssessCommon.NOT_EVALUATED);
 			 lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
 			 lawsAssesses.add(assess);
+			 allByProjectIdNotDeletedIdList.add(standardId);
 		 }
 		 lawsAssessService.saveBatch(lawsAssesses);
 		 return Result.OK("操作成功!");
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
index 3b99cd4c..d8cf2369 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
@@ -136,8 +136,9 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
 		if (StringUtils.isBlank(projectId)){
 			return new ArrayList<>();
 		}
+		List<String> projectIdList = Arrays.asList(projectId.split(","));
 		LambdaQueryWrapper<LawsAssess> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(LawsAssess::getProjectId, projectId);
+		wrapper.in(LawsAssess::getProjectId, projectIdList);
 		wrapper.eq(LawsAssess::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
 		return list(wrapper);
 	}