diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/EqptFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/EqptFileMapper.java
index 25f8e2a..680e311 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/EqptFileMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/EqptFileMapper.java
@@ -20,6 +20,6 @@
 public interface EqptFileMapper extends BaseMapper<EqptFile> {
 
     List<EqptFile> listScopePage(@Param("page") Page<EqptFile> page,
-                                 @Param("dataScope") DataScope dataScope,
+                                 //@Param("dataScope") DataScope dataScope,
                                  @Param("ew")QueryWrapper<EqptFile> queryWrapper);
 }

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/EqptFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/EqptFileMapper.java
index 25f8e2a..680e311 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/EqptFileMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/EqptFileMapper.java
@@ -20,6 +20,6 @@
 public interface EqptFileMapper extends BaseMapper<EqptFile> {
 
     List<EqptFile> listScopePage(@Param("page") Page<EqptFile> page,
-                                 @Param("dataScope") DataScope dataScope,
+                                 //@Param("dataScope") DataScope dataScope,
                                  @Param("ew")QueryWrapper<EqptFile> queryWrapper);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
index 3ec8363..402610a 100644
--- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
@@ -3,33 +3,34 @@
 <mapper namespace="com.casic.missiles.mapper.board.NoticeBoardMapper">
 
     <select id="statisticsInfoList" resultType="com.casic.missiles.dto.board.EquipmentStatisticsList">
+        select * from (
         WITH latest_relation AS (
-            SELECT *
-            FROM biz_business_order_sample_relation a
-            WHERE id = (
-            SELECT max( id )
-            FROM biz_business_order_sample_relation b
-            WHERE a.sample_id = b.sample_id )
+        SELECT *
+        FROM biz_business_order_sample_relation a
+        WHERE id = (
+        SELECT max( id )
+        FROM biz_business_order_sample_relation b
+        WHERE a.sample_id = b.sample_id )
         )
 
         SELECT
-            e.id AS equipmentId,
-            e.dept_id AS deptId,
-            d.FULL_NAME AS deptname,
-            e.usage_status AS usageStatus,
-            e.equipment_type as equipmentType,
-            e.certificate_valid AS certificateValid,
-            r.sample_status AS latestSampleStatus,
-            IF(EXISTS (SELECT id FROM biz_business_order_sample_relation tmp
-                        WHERE tmp.sample_id = e.id
-                        AND YEAR ( tmp.update_time ) = YEAR (NOW())
-                        AND tmp.sample_status IN
-                        <foreach collection="checkedStatus" item="item" index="index" open="(" close=")" separator=",">
-                            #{item}
-                        </foreach>),
-                        1,
-                        0
-            ) AS yearChecked
+        e.id AS equipmentId,
+        e.dept_id AS deptId,
+        d.FULL_NAME AS deptname,
+        e.usage_status AS usageStatus,
+        e.equipment_type as equipmentType,
+        e.certificate_valid AS certificateValid,
+        r.sample_status AS latestSampleStatus,
+        IF(EXISTS (SELECT id FROM biz_business_order_sample_relation tmp
+        WHERE tmp.sample_id = e.id
+        AND YEAR ( tmp.update_time ) = YEAR (NOW())
+        AND tmp.sample_status IN
+        <foreach collection="checkedStatus" item="item" index="index" open="(" close=")" separator=",">#{item}
+        </foreach>),
+        1,
+        0
+        ) AS
+        yearChecked
         FROM eqpt_equipment_info e
         LEFT JOIN latest_relation r ON e.id = r.sample_id
         LEFT JOIN sys_dept d ON e.dept_id = d.id
@@ -46,7 +47,7 @@
             <foreach collection="deptIds" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
-        </if>
+        </if>) a
     </select>
 
 

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/EqptFileMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/EqptFileMapper.java
index 25f8e2a..680e311 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/EqptFileMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/EqptFileMapper.java
@@ -20,6 +20,6 @@
 public interface EqptFileMapper extends BaseMapper<EqptFile> {
 
     List<EqptFile> listScopePage(@Param("page") Page<EqptFile> page,
-                                 @Param("dataScope") DataScope dataScope,
+                                 //@Param("dataScope") DataScope dataScope,
                                  @Param("ew")QueryWrapper<EqptFile> queryWrapper);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
index 3ec8363..402610a 100644
--- a/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/board/NoticeBoardMapper.xml
@@ -3,33 +3,34 @@
 <mapper namespace="com.casic.missiles.mapper.board.NoticeBoardMapper">
 
     <select id="statisticsInfoList" resultType="com.casic.missiles.dto.board.EquipmentStatisticsList">
+        select * from (
         WITH latest_relation AS (
-            SELECT *
-            FROM biz_business_order_sample_relation a
-            WHERE id = (
-            SELECT max( id )
-            FROM biz_business_order_sample_relation b
-            WHERE a.sample_id = b.sample_id )
+        SELECT *
+        FROM biz_business_order_sample_relation a
+        WHERE id = (
+        SELECT max( id )
+        FROM biz_business_order_sample_relation b
+        WHERE a.sample_id = b.sample_id )
         )
 
         SELECT
-            e.id AS equipmentId,
-            e.dept_id AS deptId,
-            d.FULL_NAME AS deptname,
-            e.usage_status AS usageStatus,
-            e.equipment_type as equipmentType,
-            e.certificate_valid AS certificateValid,
-            r.sample_status AS latestSampleStatus,
-            IF(EXISTS (SELECT id FROM biz_business_order_sample_relation tmp
-                        WHERE tmp.sample_id = e.id
-                        AND YEAR ( tmp.update_time ) = YEAR (NOW())
-                        AND tmp.sample_status IN
-                        <foreach collection="checkedStatus" item="item" index="index" open="(" close=")" separator=",">
-                            #{item}
-                        </foreach>),
-                        1,
-                        0
-            ) AS yearChecked
+        e.id AS equipmentId,
+        e.dept_id AS deptId,
+        d.FULL_NAME AS deptname,
+        e.usage_status AS usageStatus,
+        e.equipment_type as equipmentType,
+        e.certificate_valid AS certificateValid,
+        r.sample_status AS latestSampleStatus,
+        IF(EXISTS (SELECT id FROM biz_business_order_sample_relation tmp
+        WHERE tmp.sample_id = e.id
+        AND YEAR ( tmp.update_time ) = YEAR (NOW())
+        AND tmp.sample_status IN
+        <foreach collection="checkedStatus" item="item" index="index" open="(" close=")" separator=",">#{item}
+        </foreach>),
+        1,
+        0
+        ) AS
+        yearChecked
         FROM eqpt_equipment_info e
         LEFT JOIN latest_relation r ON e.id = r.sample_id
         LEFT JOIN sys_dept d ON e.dept_id = d.id
@@ -46,7 +47,7 @@
             <foreach collection="deptIds" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
-        </if>
+        </if>) a
     </select>
 
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
index 5bf434a..d00f9ac 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/file/EqptFileServiceImpl.java
@@ -61,7 +61,7 @@
         queryWrapper.like(StrUtil.isNotEmpty(fileNo),"file_no",fileNo);
         queryWrapper.like(StrUtil.isNotEmpty(fileName),"file_name",fileName);
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-        List<EqptFile> list = this.baseMapper.listScopePage(page,dataScope,queryWrapper);
+        List<EqptFile> list = this.baseMapper.listScopePage(page,queryWrapper);
         list.forEach(i-> {
             try {
                 DictCodeUtils.convertDictCodeToName(i);