From 32b586d13d2f58d3a550e48a8e7f51fea06938b8 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 18 Aug 2026 15:35:54 +0800 Subject: [PATCH] bug fix --- .../app/executor/QualFilingChangeExecutor.java | 2 +- .../app/executor/QualFilingExpertExecutor.java | 10 ++++++---- .../safetyeval/infrastructure/remote/SystemRemote.java | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java index 7473a595..5d12ffc3 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java @@ -210,7 +210,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { // 原因:监管端备案变更管理列表"变更项"列需要展示,但原 CO 未聚合该字段导致前端为空。 if (!CollectionUtils.isEmpty(cos)) { List changeIds = cos.stream() - .map(QualFilingChangeCO::getChangeFilingId) + .map(QualFilingChangeCO::getId) .filter(Objects::nonNull) .distinct() .collect(Collectors.toList()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExpertExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExpertExecutor.java index 00dc8b94..c7ff4844 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExpertExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExpertExecutor.java @@ -1,9 +1,10 @@ package org.qinan.safetyeval.app.executor; +import cn.hutool.json.JSONUtil; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.system.client.user.request.RoleDeptAddCmd; +import com.jjb.saas.system.client.user.request.UpdateUserInfoCmd; import com.jjb.saas.system.client.user.request.UserAddCmd; -import com.jjb.saas.system.client.user.request.UserUpdateCmd; import com.zcloud.gbscommon.utils.MD5; import com.zcloud.gbscommon.utils.Sm2Util; import lombok.extern.slf4j.Slf4j; @@ -113,10 +114,11 @@ public class QualFilingExpertExecutor implements QualFilingExpertApi { @Transactional(rollbackFor = Exception.class) public SingleResponse modify(QualFilingExpertModifyCmd cmd) { QualFilingExpertEntity expertEntity = qualFilingExpertDomainService.get(cmd.getId()); - UserUpdateCmd updateCmd = new UserUpdateCmd(); - updateCmd.setId(expertEntity.getUserId()); + UpdateUserInfoCmd updateCmd = new UpdateUserInfoCmd(); + updateCmd.setUserId(expertEntity.getUserId()); updateCmd.setAccount(cmd.getAccount()); - updateCmd.setAccount(cmd.getUserName()); + updateCmd.setName(cmd.getUserName()); + log.info("export modify:{}", JSONUtil.toJsonStr(updateCmd)); systemRemote.updateUser(updateCmd); QualFilingExpertEntity entity = new QualFilingExpertEntity(); 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 561804c1..4f3a7aed 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 @@ -4,10 +4,10 @@ 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.UpdateUserInfoCmd; 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.request.UserUpdateCmd; import com.jjb.saas.system.client.user.response.UserCO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -84,8 +84,8 @@ public class SystemRemote { } } - public void updateUser(UserUpdateCmd updateCmd) { - Response response = userFacade.update(updateCmd); + public void updateUser(UpdateUserInfoCmd updateCmd) { + Response response = userFacade.updateUserInfo(updateCmd); if (!response.isSuccess()) { log.error("updateUser error :{}", response.getErrMessage()); throw new BizException(response.getErrCode(), response.getErrMessage());