diff --git a/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/ProjectServiceImpl.java b/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/ProjectServiceImpl.java index 2b49896d3e6a3250283baad95ee51d39ff83e75f..13f81499449f9002bb8986d8bae87548ac98d0e2 100644 --- a/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/ProjectServiceImpl.java +++ b/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);