diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaPartTypeMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaPartTypeMapper.java index 812f831..21c8467 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaPartTypeMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaPartTypeMapper.java @@ -56,5 +56,7 @@ public interface MaPartTypeMapper { int checkPartName(String paName); List selectPartName(String paName); + + List selectPartNameByLevel(MaPartType maPartType); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java index ab5867c..5291f2d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java @@ -42,6 +42,13 @@ public class MaPartTypeServiceImpl implements IPartTypeService { // if (StringUtils.isNotNull(info) && info.getPaId().longValue() != paId.longValue()) { // return UserConstants.NOT_UNIQUE; // } + // 查询具有相同paName的所有MaPartType对象 + if (maPartType.getLevel() != null && maPartType.getParentId() != null) { + List maPartTypes = maPartTypeMapper.selectPartNameByLevel(maPartType); + if (maPartTypes.size() > 0) { + return UserConstants.NOT_UNIQUE; + } + } // 查询具有相同paName的所有MaPartType对象 List maPartTypes = maPartTypeMapper.selectPartName(maPartType.getPaName()); @@ -142,7 +149,7 @@ public class MaPartTypeServiceImpl implements IPartTypeService { String templateName = "template.xlsx"; OutputStream out = null; - InputStream input =null; + InputStream input = null; try { // ApplicationHome h = new ApplicationHome(getClass()); // String dirPath = h.getSource().toString(); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml index 0e11fde..d63a0d1 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml @@ -197,5 +197,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ma_part_type where pa_name = #{paName} +