diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java index 8d195406..c337cf84 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java @@ -104,10 +104,13 @@ public class UserUpdateExe { UserE userE = new UserE(); BeanUtils.copyProperties(userUpdateCmd, userE); + + UserDO userDO = userRepository.getInfoById(userUpdateCmd.getId()); if (userDO == null) { throw new BizException("用户不存在,用户id:" + userUpdateCmd.getId()); } + userE.setDahuaId(userDO.getDahuaId()); userE.setDahuaCode(userDO.getDahuaCode()); log.info("【getInfoById查询结果】dahuaId={}, dahuaCode={}, name={}, userIdCard={}", diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index 054e9008..dba31378 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -291,7 +291,7 @@ public class UserQueryExe { throw new BizException("用户不存在"); } // TODO zcloudTenantTypeConfigFacade特定业务,写死的defaultType0003 - Integer xgfCode = zcloudTenantTypeConfigFacade.getDefaultType("defaultType0003"); + Integer xgfCode = zcloudTenantTypeConfigFacade.getDefaultTypeNoToken("defaultType0003", cmd.getAppDefaultToken()); //获取在职的用户取第一个 UserDO userDO = userDOList.stream().filter(userDO1 -> UserEmploymentFlagEnum.ON.getCode().equals(userDO1.getEmploymentFlag())) .filter(userDO1 -> xgfCode.equals(userDO1.getUserType())).findFirst().orElse(null); diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java index eff216a9..4ecf3262 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java @@ -178,5 +178,6 @@ public class CorpInfoAddCmd extends Command { private List selectfromList; @ApiModelProperty(value = "经营范围", name = "natureBusiness") private String natureBusiness; + } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAppLoginCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAppLoginCmd.java index c89faf03..f7034666 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAppLoginCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAppLoginCmd.java @@ -29,5 +29,10 @@ public class UserAppLoginCmd { @NotEmpty(message = "验证码key不能为空") private String captchaKey; + + + @ApiModelProperty(value = "app所属租户", name = "appDefaultToken", required = true) + private Long appDefaultToken; + }