|
@@ -62,9 +62,10 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
|
|
|
|
|
|
Integer parentId = structureAddNewDTO.getParentId();
|
|
|
String structureName = structureAddNewDTO.getStructureName();
|
|
|
+ Integer productId = structureAddNewDTO.getProductId();
|
|
|
//检查名称是否被占用(检查当前架构父级下是否有同名架构)
|
|
|
log.info("检查名称是否被占用(检查当前父级下是否有同名架构)");
|
|
|
- int count = structureMapper.countByparentIdAndStructureName(parentId, structureName, null);
|
|
|
+ int count = structureMapper.countByparentIdAndStructureName(productId, parentId, structureName, null);
|
|
|
if (count > 0) {
|
|
|
String message = "新增架构失败,当前父级下已存在【" + structureName + "】,请尝试更换名称";
|
|
|
log.info("{}", message);
|
|
@@ -159,10 +160,11 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
|
|
|
String newPath = structureUpdateDTO.getParentPath() + "," + structureId;
|
|
|
//获取DTO中该架构当前名称
|
|
|
String newStructureName = structureUpdateDTO.getStructureName();
|
|
|
+ Integer productId = structureUpdateDTO.getProductId();
|
|
|
|
|
|
//检查名称是否被占用(检查当前尝试修改的架构父级下是否有同名架构)
|
|
|
log.info("检查名称是否被占用(检查当前尝试修改的架构的新父级下是否有同名架构)");
|
|
|
- int count = structureMapper.countByparentIdAndStructureName(newParentId, newStructureName, structureId);
|
|
|
+ int count = structureMapper.countByparentIdAndStructureName(productId, newParentId, newStructureName, structureId);
|
|
|
if (count > 0) {
|
|
|
String message = "修改架构失败,当前尝试修改的架构父级下已存在【" + newStructureName + "】,请尝试更换名称";
|
|
|
log.info("{}", message);
|