diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/AppUserRegisterCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/AppUserRegisterCmd.java index ad9e09ee..075c28bb 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/AppUserRegisterCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/AppUserRegisterCmd.java @@ -37,5 +37,7 @@ public class AppUserRegisterCmd extends Command { @NotEmpty(message = "验证码不能为空") private String phoneCode; + @ApiModelProperty(value = "app所属租户", name = "appDefaultToken", required = true) + private Long appDefaultToken; } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java index b31b49ee..7623cfc0 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java @@ -169,7 +169,9 @@ public class UserE extends BaseE { // 性别 private String sex; // 微信openid + private String openId; + private Long appDefaultToken; public static Boolean checkUserInfoComplete(UserE userE, Integer flowFlag) { return StringUtils.isNotEmpty(userE.getUsername()) && diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java index fe4acdcc..b515c2ed 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java @@ -195,8 +195,9 @@ public class UserDO extends BaseDO { @ApiModelProperty(value = "是否缴纳其他人身伤害保险") private Integer isBf; - - + @ApiModelProperty(value = "app所属租户") + @TableField(exist = false) + private Long appDefaultToken; @@ -209,4 +210,4 @@ public class UserDO extends BaseDO { this.userId = userId; } -} \ No newline at end of file +} diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index d9a9ab92..0bce8c54 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -438,7 +438,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i userDO.setCorpinfoId(null); // 默认是相关方 // TODO zcloudTenantTypeConfigFacade特定业务,写死的defaultType0003 - userDO.setUserType(zcloudTenantTypeConfigFacade.getDefaultType("defaultType0003")); + userDO.setUserType(zcloudTenantTypeConfigFacade.getDefaultTypeNoToken("defaultType0003",userDO.getAppDefaultToken())); save(userDO); }