From 8fe973c736b8700bfa383c1e7d807c2f9260e774 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Mon, 3 Aug 2026 16:52:17 +0800 Subject: [PATCH] import --- .../infrastructure/remote/SystemRemote.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/remote/SystemRemote.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/remote/SystemRemote.java index 89e5fd3..cfd496c 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/remote/SystemRemote.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/remote/SystemRemote.java @@ -1,9 +1,11 @@ package org.qinan.safetyeval.infrastructure.remote; +import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.system.client.user.facade.UserFacade; import com.jjb.saas.system.client.user.request.UserAddCmd; +import com.jjb.saas.system.client.user.request.UserPageQry; import com.jjb.saas.system.client.user.request.UserRoleUpdateCmd; import com.jjb.saas.system.client.user.response.UserCO; import lombok.RequiredArgsConstructor; @@ -44,14 +46,20 @@ public class SystemRemote { * @return userId */ public Long addUserIfAbsent(UserAddCmd userAddCmd) { - SingleResponse userResponse = userFacade - .getUserSignUrlByMobileAndTenantId(userAddCmd.getMobile(), userAddCmd.getTenantId()); + UserPageQry qry = new UserPageQry(); + qry.setAccount(userAddCmd.getAccount()); + qry.setTenantId(userAddCmd.getTenantId()); + PageResponse userResponse = userFacade.pageUser(qry); if (!userResponse.isSuccess()) { log.error("addUserIfAbsent find fail:{}", userResponse.getErrMessage()); - throw new com.alibaba.cola.exception.BizException(userResponse.getErrMessage()); + throw new BizException(userResponse.getErrCode(), userResponse.getErrMessage()); } - if (userResponse.getData() != null && userResponse.getData().getId() != null) { - return userResponse.getData().getId(); + if (userResponse.getTotalCount() >= 1) { + if (userResponse.getTotalCount() == 1) { + return userResponse.getData().get(0).getId(); + } + log.error("addUserIfAbsent find fail count:{}", userResponse.getErrMessage()); + throw new com.alibaba.cola.exception.BizException("账号查询到多条记录"); } // 新增用户