bug fix
parent
6c89afb541
commit
32b586d13d
|
|
@ -210,7 +210,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
|
||||||
// 原因:监管端备案变更管理列表"变更项"列需要展示,但原 CO 未聚合该字段导致前端为空。
|
// 原因:监管端备案变更管理列表"变更项"列需要展示,但原 CO 未聚合该字段导致前端为空。
|
||||||
if (!CollectionUtils.isEmpty(cos)) {
|
if (!CollectionUtils.isEmpty(cos)) {
|
||||||
List<Long> changeIds = cos.stream()
|
List<Long> changeIds = cos.stream()
|
||||||
.map(QualFilingChangeCO::getChangeFilingId)
|
.map(QualFilingChangeCO::getId)
|
||||||
.filter(Objects::nonNull)
|
.filter(Objects::nonNull)
|
||||||
.distinct()
|
.distinct()
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
package org.qinan.safetyeval.app.executor;
|
package org.qinan.safetyeval.app.executor;
|
||||||
|
|
||||||
|
import cn.hutool.json.JSONUtil;
|
||||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
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.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.UserAddCmd;
|
||||||
import com.jjb.saas.system.client.user.request.UserUpdateCmd;
|
|
||||||
import com.zcloud.gbscommon.utils.MD5;
|
import com.zcloud.gbscommon.utils.MD5;
|
||||||
import com.zcloud.gbscommon.utils.Sm2Util;
|
import com.zcloud.gbscommon.utils.Sm2Util;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
@ -113,10 +114,11 @@ public class QualFilingExpertExecutor implements QualFilingExpertApi {
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public SingleResponse<QualFilingExpertCO> modify(QualFilingExpertModifyCmd cmd) {
|
public SingleResponse<QualFilingExpertCO> modify(QualFilingExpertModifyCmd cmd) {
|
||||||
QualFilingExpertEntity expertEntity = qualFilingExpertDomainService.get(cmd.getId());
|
QualFilingExpertEntity expertEntity = qualFilingExpertDomainService.get(cmd.getId());
|
||||||
UserUpdateCmd updateCmd = new UserUpdateCmd();
|
UpdateUserInfoCmd updateCmd = new UpdateUserInfoCmd();
|
||||||
updateCmd.setId(expertEntity.getUserId());
|
updateCmd.setUserId(expertEntity.getUserId());
|
||||||
updateCmd.setAccount(cmd.getAccount());
|
updateCmd.setAccount(cmd.getAccount());
|
||||||
updateCmd.setAccount(cmd.getUserName());
|
updateCmd.setName(cmd.getUserName());
|
||||||
|
log.info("export modify:{}", JSONUtil.toJsonStr(updateCmd));
|
||||||
systemRemote.updateUser(updateCmd);
|
systemRemote.updateUser(updateCmd);
|
||||||
|
|
||||||
QualFilingExpertEntity entity = new QualFilingExpertEntity();
|
QualFilingExpertEntity entity = new QualFilingExpertEntity();
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@ import com.alibaba.cola.dto.PageResponse;
|
||||||
import com.alibaba.cola.dto.Response;
|
import com.alibaba.cola.dto.Response;
|
||||||
import com.alibaba.cola.dto.SingleResponse;
|
import com.alibaba.cola.dto.SingleResponse;
|
||||||
import com.jjb.saas.system.client.user.facade.UserFacade;
|
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.UserAddCmd;
|
||||||
import com.jjb.saas.system.client.user.request.UserPageQry;
|
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.UserRoleUpdateCmd;
|
||||||
import com.jjb.saas.system.client.user.request.UserUpdateCmd;
|
|
||||||
import com.jjb.saas.system.client.user.response.UserCO;
|
import com.jjb.saas.system.client.user.response.UserCO;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
@ -84,8 +84,8 @@ public class SystemRemote {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateUser(UserUpdateCmd updateCmd) {
|
public void updateUser(UpdateUserInfoCmd updateCmd) {
|
||||||
Response response = userFacade.update(updateCmd);
|
Response response = userFacade.updateUserInfo(updateCmd);
|
||||||
if (!response.isSuccess()) {
|
if (!response.isSuccess()) {
|
||||||
log.error("updateUser error :{}", response.getErrMessage());
|
log.error("updateUser error :{}", response.getErrMessage());
|
||||||
throw new BizException(response.getErrCode(), response.getErrMessage());
|
throw new BizException(response.getErrCode(), response.getErrMessage());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue