From 21fa58aec75d9fab7c4984674fa1f8929dc1f39d Mon Sep 17 00:00:00 2001
From: zhanglei <xx@cenxi.online>
Date: Tue, 4 Aug 2026 19:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82,=E8=B5=84=E8=B4=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8B=E5=8F=91app=E7=AD=BE=E5=AD=97?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qinan/safetyeval/app/executor/OrgEquipmentExecutor.java   | 1 +
 .../qinan/safetyeval/app/executor/OrgPersonnelExecutor.java   | 4 +++-
 .../safetyeval/app/orchestrator/QualFilingOrchestrator.java   | 1 +
 .../infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java   | 1 +
 .../src/main/resources/mapper/QualFilingMapper.xml            | 2 +-
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java
index a25ae99..c551eb2 100644
--- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java
+++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java
@@ -93,6 +93,7 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi {
         entity.setFieldCalibrationTypeName(cmd.getFieldCalibrationTypeName());
         entity.setDualChannelFlag(cmd.getDualChannelFlag());
         entity.setEnableFlag(cmd.getEnableFlag());
+        entity.setEquipmentValue(cmd.getEquipmentValue());
 
         OrgEquipmentEntity result = orgEquipmentDomainService.modify(entity);
         return SingleResponse.success(toCO(result));
diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java
index 7061df7..12e7def 100644
--- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java
+++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java
@@ -1,5 +1,6 @@
 package org.qinan.safetyeval.app.executor;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jjb.saas.system.client.user.request.UserAddCmd;
 import com.jjb.saas.system.client.user.request.UserRoleUpdateCmd;
 import com.jjb.saas.system.client.user.request.UserUpdatePasswordCmd;
@@ -361,7 +362,8 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
 
     @Override
     public SingleResponse<List<OrgPersonnelCO>> getOrgPersonnel() {
-        List<OrgPersonnelDO> orgPersonnelDOS = orgPersonnelMapper.selectList(null);
+        List<OrgPersonnelDO> orgPersonnelDOS = orgPersonnelMapper.selectList(new LambdaQueryWrapper<OrgPersonnelDO>()
+                .eq(OrgPersonnelDO::getOrgId, ThreadLocalUserInfoAdapter.getOrgId()));
         List<OrgPersonnelCO> orgPersonnelCOS = orgPersonnelDOS.stream().map(item -> {
             OrgPersonnelCO orgPersonnelCO = new OrgPersonnelCO();
             BeanUtils.copyProperties(item, orgPersonnelCO);
diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java
index 07a97c7..e2be0cd 100644
--- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java
+++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java
@@ -869,6 +869,7 @@ public class QualFilingOrchestrator {
         co.setDualChannelFlag(entity.getDualChannelFlag());
         co.setCalibrationReportUrl(entity.getCalibrationReportUrl());
         co.setTenantId(entity.getTenantId());
+        co.setEquipmentValue(entity.getEquipmentValue());
         return co;
     }
 
diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java
index bb83f9c..b363444 100644
--- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java
+++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java
@@ -113,6 +113,7 @@ public class OrgEquipmentGatewayImpl implements OrgEquipmentGateway {
         dataObject.setDualChannelFlag(entity.getDualChannelFlag());
         dataObject.setEnableFlag(entity.getEnableFlag());
         dataObject.setTenantId(entity.getTenantId());
+        dataObject.setEquipmentValue(entity.getEquipmentValue());
         return dataObject;
     }
 
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml
index 586ba60..b385c1d 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml
@@ -62,7 +62,7 @@
     <select id="qualificationMonitoringPage" resultMap="QualFilingCOResultMap">
         select info.credit_code as orgInfoCreditCode, info.unit_name as unitName, filing.*  from org_info as info
             left join qual_filing as filing on info.id = filing.org_id
-        where info.delete_enum = 'false'
+        where info.delete_enum = 'false' and filing.filing_status_code = 1
             <if test="query.keyword != null">
                 and (info.credit_code like concat('%',#{query.keyword},'%') or info.unit_name like concat('%',#{query.keyword},'%'))
             </if>