wangli/im-center
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:feature-REQ/2129 管理端ouid为空的情况

Browse Source
This commit is contained in:
lilong 2024-04-03 18:07:40 +08:00
parent 4fb55ecdce
commit b149c22c67
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
im-center-server/src/main/java/cn/axzo/im/service/AccountService.java
View File

@ -341,7 +341,7 @@ public class AccountService {
.appType(appTypeEnum.getCode()) .appType(appTypeEnum.getCode())
.accountId(accountAbsentQuery.getPersonId()) .accountId(accountAbsentQuery.getPersonId())
.build(); .build();
if (appTypeEnum == AppTypeEnum.CMP && accountAbsentQuery.getOuId() != 0) { if (appTypeEnum == AppTypeEnum.CMP && accountAbsentQuery.getOuId() != null && accountAbsentQuery.getOuId() != 0) {
listAccountRegisterParam.setOuId(accountAbsentQuery.getOuId()); listAccountRegisterParam.setOuId(accountAbsentQuery.getOuId());
} }
List<AccountRegisterService.AccountRegisterDTO> accountRegisters = accountRegisterService.list(listAccountRegisterParam); List<AccountRegisterService.AccountRegisterDTO> accountRegisters = accountRegisterService.list(listAccountRegisterParam);
@ -368,7 +368,7 @@ public class AccountService {
userAccountReq.setUserId(accountAbsentQuery.getPersonId()); userAccountReq.setUserId(accountAbsentQuery.getPersonId());
userAccountReq.setNickName(DEFAULT_NICK_NAME + accountAbsentQuery.getPersonId()); userAccountReq.setNickName(DEFAULT_NICK_NAME + accountAbsentQuery.getPersonId());
// 管理版需要根据ou注册IM账号，做数据隔离 // 管理版需要根据ou注册IM账号，做数据隔离
if (appTypeEnum == AppTypeEnum.CMP && accountAbsentQuery.getOuId() != 0) { if (appTypeEnum == AppTypeEnum.CMP && accountAbsentQuery.getOuId() != null && accountAbsentQuery.getOuId() != 0) {
userAccountReq.setOrganizationalUnitId(accountAbsentQuery.getOuId()); userAccountReq.setOrganizationalUnitId(accountAbsentQuery.getOuId());
} }
UserAccountResp accountResp = generateAccount(userAccountReq, iNotifyService); UserAccountResp accountResp = generateAccount(userAccountReq, iNotifyService);