diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java index ff9f6f92..929dd198 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java @@ -60,10 +60,10 @@ public class BmUnit extends BaseEntity @Size(max=64, message = "联系人长度不能超过64") private String linkMan; - /** 联系方式 */ - @Excel(name = "联系方式") - @ApiModelProperty(value = "联系方式") - @Size(max=64, message = "联系方式长度不能超过64") + /** 联系电话 */ + @Excel(name = "联系电话") + @ApiModelProperty(value = "联系电话") + @Size(max=64, message = "联系电话长度不能超过64") private String telphone; /** 删除标志(0代表存在 2代表删除) */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java index f7c218ca..ef3db5a8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java @@ -257,12 +257,14 @@ public class TypeServiceImpl implements ITypeService { type.setCreateTime(DateUtils.getNowDate()); type.setCreateBy(SecurityUtils.getUserId().toString()); int count = typeMapper.insertType(type); - long newTypeId = type.getTypeId(); - // 插入wh_house_set,建立仓库和type的关系 - WhHouseSet whHouseSet = new WhHouseSet(); - whHouseSet.setHouseId(type.getHouseId()); - whHouseSet.setTypeId(newTypeId); - houseSetService.insertWhHouseSet(whHouseSet); + if ((type.getParentId()).equals(0L)) { + // 插入wh_house_set,建立仓库和type的关系 + long newTypeId = type.getTypeId(); + WhHouseSet whHouseSet = new WhHouseSet(); + whHouseSet.setHouseId(type.getHouseId()); + whHouseSet.setTypeId(newTypeId); + houseSetService.insertWhHouseSet(whHouseSet); + } return count; }