项目编号和项目名称都要校验是否重复

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/ProjectServiceImpl.java

@@ -84,9 +84,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 		}
 		QueryWrapper<Project> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());
+		qw.or();
+		qw.eq("code", query.getCode());
 		int count = projectMapper.selectCount(qw);
 		if (count > 0) {
-			return BaseResponse.errorMsg("项目名称已存在!");
+			return BaseResponse.errorMsg("项目已存在!");
 		}
 		Project create = new Project();
 		BeanUtils.copyProperties(query, create);
@@ -108,11 +110,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 		}
 		//判断名字是否重复
 		QueryWrapper<Project> qw = new QueryWrapper<>();
-		qw.eq("name", query.getName());
-		qw.ne("id", query.getId());
+		qw.and(arg-> arg.ne("id", query.getId()).eq("name", query.getName()));
+		qw.or(arg-> arg.ne("id", query.getId()).eq("code", query.getCode()));
 		int count = projectMapper.selectCount(qw);
 		if (count > 0) {
-			return BaseResponse.errorMsg("项目名称已存在!");
+			return BaseResponse.errorMsg("项目已存在!");
 		}
 		Project update = new Project();
 		BeanUtils.copyProperties(query, update);