修改相关方无法登陆bug

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={}",

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);

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java

@@ -178,5 +178,6 @@ public class CorpInfoAddCmd extends Command {
     private List<CorpInfoXgfItemCmd> selectfromList;
     @ApiModelProperty(value = "经营范围", name = "natureBusiness")
     private String natureBusiness;
+
 }
 

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;
+
 }