diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java index 3715bca94..9d138d125 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java @@ -145,7 +145,7 @@ public class UserEntity extends BaseVOEntity { private Long shipperId; @ApiModelProperty(name = "部门ID") - private Integer departmentId; + private String departmentId; @ApiModelProperty private Boolean hasDefaultAddress; @@ -192,4 +192,4 @@ public class UserEntity extends BaseVOEntity { @ApiModelProperty("税号") private String taxNumber; -} +} \ No newline at end of file diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/factory/UserFactory.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/factory/UserFactory.java index 73fa75fe9..92ae806c8 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/factory/UserFactory.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/factory/UserFactory.java @@ -21,7 +21,7 @@ public class UserFactory { public UserEntity getUserEntity(UserDO userDO) { UserEntity userEntity = new UserEntity(); BeanUtils.copyProperties(userDO,userEntity, IgnoreNullUtil.getNullPropertyNames(userDO)); - userEntity.setDepartmentId(ObjectUtil.isNotEmpty(userDO.getDepartmentId())?Integer.valueOf(userDO.getDepartmentId()):null); + userEntity.setDepartmentId(ObjectUtil.isNotEmpty(userDO.getDepartmentId())?userDO.getDepartmentId():null); return userEntity; } public CheckDO getCheckDo(UserDO userDO) { @@ -30,4 +30,4 @@ public class UserFactory { return checkDO; } -} +} \ No newline at end of file