From 86689d789501eafc7f6379199d43326ca3fda062 Mon Sep 17 00:00:00 2001
From: luotaiqian <1147642922@qq.com>
Date: Wed, 8 Jul 2026 20:54:03 +0800
Subject: [PATCH 1/2] bug fix
---
.../safetyeval/app/executor/QualFilingChangeExecutor.java | 4 ++--
.../safetyeval/client/dto/QualFilingChangePageQuery.java | 3 ++-
.../qinan/safetyeval/domain/query/QualFilingChangeQuery.java | 2 ++
.../gatewayimpl/QualFilingChangeGatewayImpl.java | 3 +++
.../src/main/resources/mapper/QualFilingChangeMapper.xml | 3 +++
5 files changed, 12 insertions(+), 3 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 13ade60..05aa97c 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
@@ -167,7 +167,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize());
domainQuery.setTenantId(AuthUserContextAdapter.getCurrentTenantId());
- domainQuery.setFilingNo(query.getFilingNo());
+ domainQuery.setId(query.getId());
domainQuery.setFilingUnitName(query.getFilingUnitName());
domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode());
domainQuery.setFilingStatusCode(query.getFilingStatusCode());
@@ -183,7 +183,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
domainQuery.setPageNum(query.getCurrent());
domainQuery.setPageSize(query.getSize());
domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId());
- domainQuery.setFilingNo(query.getFilingNo());
+ domainQuery.setId(query.getId());
domainQuery.setFilingUnitName(query.getFilingUnitName());
domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode());
domainQuery.setFilingStatusCode(query.getFilingStatusCode());
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java
index 5c6f517..76139d0 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java
@@ -17,7 +17,8 @@ public class QualFilingChangePageQuery extends BasePageQuery {
private Long orgId;
@ApiModelProperty(value = "备案编号")
- private String filingNo;
+// private String filingNo;
+ private Long id;
@ApiModelProperty(value = "备案单位")
private String filingUnitName;
diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingChangeQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingChangeQuery.java
index 79d7e32..c55fce7 100644
--- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingChangeQuery.java
+++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingChangeQuery.java
@@ -28,6 +28,8 @@ public class QualFilingChangeQuery {
/** 备案编号 */
private String filingNo;
+ private Long id;
+
/** 备案单位 */
private String filingUnitName;
diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java
index 4ca8e94..01e172e 100644
--- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java
+++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java
@@ -122,6 +122,9 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway {
if (StringUtils.hasText(query.getFilingNo())) {
wrapper.like(QualFilingChangeDO::getFilingNo, query.getFilingNo());
}
+ if (query.getId() != null) {
+ wrapper.eq(QualFilingChangeDO::getId, query.getId());
+ }
if (StringUtils.hasText(query.getFilingUnitName())) {
wrapper.like(QualFilingChangeDO::getFilingUnitName, query.getFilingUnitName());
}
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml
index c2dc151..0894e9a 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingChangeMapper.xml
@@ -100,6 +100,9 @@
AND qfc.filing_no LIKE CONCAT('%', #{query.filingNo}, '%')
+
+ AND qfc.id = #{query.id}
+
AND qfc.filing_unit_name LIKE CONCAT('%', #{query.filingUnitName}, '%')
From face3d535577e031ada564212c7149f630205930 Mon Sep 17 00:00:00 2001
From: zhanglei
Date: Wed, 8 Jul 2026 21:07:16 +0800
Subject: [PATCH 2/2] bug
---
.../safetyeval/app/executor/AccountExecutor.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java
index 3b8b66b..3b76156 100644
--- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java
+++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jjb.saas.system.client.user.request.UserAddCmd;
import com.zcloud.gbscommon.utils.MD5;
import com.zcloud.gbscommon.utils.Sm2Util;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.qinan.safetyeval.client.api.AccountApi;
import org.qinan.safetyeval.client.co.AccountCO;
import org.qinan.safetyeval.client.dto.*;
@@ -30,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
* @author safety-eval
*/
@Service
+@Slf4j
public class AccountExecutor implements AccountApi {
@Lazy
@@ -118,10 +121,12 @@ public class AccountExecutor implements AccountApi {
userAddCmd.setAccount(result.getAccount());
userAddCmd.setTenantId(result.getTenantId());
userAddCmd.setName(result.getUserName());
- if (result.getPassword() != null) {
- defPassword = result.getPassword();
+ String pas = defPassword;
+ if (StringUtils.isNotBlank(result.getPassword())) {
+ pas = result.getPassword();
}
- String encrypt = Sm2Util.encryptHex(MD5.md5(defPassword), publicKey);
+ log.info("同步用户密码:{}", pas);
+ String encrypt = Sm2Util.encryptHex(MD5.md5(pas), publicKey);
userAddCmd.setPassword(encrypt);
try {
gbsUserFacadeClient.add(userAddCmd);
@@ -129,7 +134,7 @@ public class AccountExecutor implements AccountApi {
// 回滚数据, 清除account表示数据,orgInfo数据
orgInfoMapper.delete(new LambdaQueryWrapper()
.eq(OrgInfoDO::getCreateId, result.getId()));
- accountDomainService.delete(result.getId());
+
throw new BizException(ErrorCode.GBS_USER_SYNC_ERROR);
}
return SingleResponse.success(toCO(result));