From b82b96c0a280ab4d337564287c87430ad817113b Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 28 Aug 2023 14:26:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96=E8=BE=91--?=
 =?UTF-8?q?=E9=AA=8C=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectRxswinEOServiceImpl.java   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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 99cf0a84f..0fc6dca34 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
@@ -31,10 +31,11 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
 	@Override
     public void add(ProjectRxswinEO projectRxswinEO) {
 		//判断主题是否已存在
-		 LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		LambdaQueryWrapper<ProjectRxswinEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(ProjectRxswinEO::getCreateBy,currentUser.getUsername());
 		wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId());
+		wrapper.eq(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme());
 		List<ProjectRxswinEO> rxswinEOList = this.list(wrapper);
 		if(!rxswinEOList.isEmpty()){
 			throw new JeroBootException("主题："+projectRxswinEO.getTheme()+"已存在，请重新添加");
@@ -53,6 +54,17 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
 	 */
 	@Override
     public void editById(ProjectRxswinEO projectRxswinEO) {
+		//判断主题是否存在
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		LambdaQueryWrapper<ProjectRxswinEO> wrapper  =new LambdaQueryWrapper<>();
+		wrapper.eq(ProjectRxswinEO::getCreateBy,currentUser.getUsername());
+		wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId());
+		wrapper.eq(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme());
+		wrapper.ne(ProjectRxswinEO::getId,projectRxswinEO.getId());
+		List<ProjectRxswinEO> rxswinEOList = this.list(wrapper);
+		if(!rxswinEOList.isEmpty()){
+			throw new JeroBootException("主题："+projectRxswinEO.getTheme()+"已存在，请重新添加");
+		}
     	Date now = new Date();
         projectRxswinEO.setUpdateTime(now);
     	saveOrUpdate(projectRxswinEO);