From d506fd426a12f471c0e90df385cb0f014f699646 Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 28 Oct 2024 15:23:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bonus/material/basic/domain/BmUnit.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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代表删除） */ From 4c9d5f7a4f55650028cae63f16b6ddadc5d08b52 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 28 Oct 2024 15:31:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=90=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=B8=A6houseId=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/ma/service/impl/TypeServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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; }