From 7ba8679d46b5a37a5945b3823cb3add9059ac0fa Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 29 Aug 2023 15:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=20=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/controller/ProjectRxswinEOController.java  | 2 ++
 .../project/service/impl/ProjectRxswinEOServiceImpl.java       | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java
index b880c9052..a4c21a126 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java
@@ -161,6 +161,8 @@ public class ProjectRxswinEOController extends JeroController<ProjectRxswinEO, I
     * @param request
     * @param projectRxswinEO
     */
+	@AutoLog(value = "导出")
+	@ApiOperation(value="导出", notes="导出")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ProjectRxswinEO projectRxswinEO) {
         return projectRxswinEOService.exportXls(request,projectRxswinEO);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java
index 43f4e1e11..1b00b5952 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java
@@ -295,7 +295,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
 
 		//新增的
 		LambdaQueryWrapper<ProjectRxswinEO> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(ProjectRxswinEO::getProjectId, projectId);
+//		wrapper.eq(ProjectRxswinEO::getProjectId, projectId);
 		wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(",")));
 		List<ProjectRxswinEO> rxswinEOList = this.list(wrapper);
 
@@ -370,6 +370,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
 				projectRxswinEO.setUpdateTime(new Date());
 				projectRxswinEO.setCreateBy(user.getUsername());
 				projectRxswinEO.setState(StatusEnum.SAVE.getValue());
+				projectRxswinEO.setProjectId(projectId);
 			}
 			//已存在的进行覆盖
 			this.updateBatchById(yesList);