diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml
index 2d66c01..ceea930 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml
@@ -15,27 +15,28 @@
     </sql>
 
     <select id="listScopePage" resultType="com.casic.missiles.dto.system.RfidListDTO">
+        select * from(
         WITH r AS (
-            SELECT DISTINCT rfid, create_user_dept as deptId FROM eqpt_system_rfid
-            UNION
-            SELECT DISTINCT rfid, dept_id as deptId FROM eqpt_equipment_info
+        SELECT DISTINCT rfid, create_user_dept as deptId FROM eqpt_system_rfid
+        UNION
+        SELECT DISTINCT rfid, dept_id as deptId FROM eqpt_equipment_info
         )
 
         SELECT
-            r.rfid as rfid,
-            r.deptId as deptId,
-            if(e.id is null,"0","1") as usageStatus,
-            e.equipment_no as equipmentNo,
-            e.equipment_name as equipmentName,
-            e.use_position as usePosition,
-            e.director_name as directorName
+        r.rfid as rfid,
+        r.deptId as deptId,
+        if(e.id is null,"0","1") as usageStatus,
+        e.equipment_no as equipmentNo,
+        e.equipment_name as equipmentName,
+        e.use_position as usePosition,
+        e.director_name as directorName
         FROM
-            r left join eqpt_equipment_info e on r.rfid = e.rfid
+        r left join eqpt_equipment_info e on r.rfid = e.rfid
         <where>
             <if test="ew != null">
                 ${ew.sqlSegment}
             </if>
-        </where>
+        </where>) A
     </select>
 
 

diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml
index 2d66c01..ceea930 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml
@@ -15,27 +15,28 @@
     </sql>
 
     <select id="listScopePage" resultType="com.casic.missiles.dto.system.RfidListDTO">
+        select * from(
         WITH r AS (
-            SELECT DISTINCT rfid, create_user_dept as deptId FROM eqpt_system_rfid
-            UNION
-            SELECT DISTINCT rfid, dept_id as deptId FROM eqpt_equipment_info
+        SELECT DISTINCT rfid, create_user_dept as deptId FROM eqpt_system_rfid
+        UNION
+        SELECT DISTINCT rfid, dept_id as deptId FROM eqpt_equipment_info
         )
 
         SELECT
-            r.rfid as rfid,
-            r.deptId as deptId,
-            if(e.id is null,"0","1") as usageStatus,
-            e.equipment_no as equipmentNo,
-            e.equipment_name as equipmentName,
-            e.use_position as usePosition,
-            e.director_name as directorName
+        r.rfid as rfid,
+        r.deptId as deptId,
+        if(e.id is null,"0","1") as usageStatus,
+        e.equipment_no as equipmentNo,
+        e.equipment_name as equipmentName,
+        e.use_position as usePosition,
+        e.director_name as directorName
         FROM
-            r left join eqpt_equipment_info e on r.rfid = e.rfid
+        r left join eqpt_equipment_info e on r.rfid = e.rfid
         <where>
             <if test="ew != null">
                 ${ew.sqlSegment}
             </if>
-        </where>
+        </where>) A
     </select>
 
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentGroupInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentGroupInfoServiceImpl.java
index cc3e86c..4a89b12 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentGroupInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentGroupInfoServiceImpl.java
@@ -67,7 +67,7 @@
     public Page<EquipmentGroupInfo> listPage(Page<EquipmentGroupInfo> page, String groupName) {
         QueryWrapper<EquipmentGroupInfo> queryWrapper = new QueryWrapper<>();
         if (StrUtil.isNotEmpty(groupName)) {
-            queryWrapper.like("group_name", groupName);
+            queryWrapper.like("binary group_name", groupName);
         }
         return this.page(page, queryWrapper);
     }

diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml
index 2d66c01..ceea930 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemRfidMapper.xml
@@ -15,27 +15,28 @@
     </sql>
 
     <select id="listScopePage" resultType="com.casic.missiles.dto.system.RfidListDTO">
+        select * from(
         WITH r AS (
-            SELECT DISTINCT rfid, create_user_dept as deptId FROM eqpt_system_rfid
-            UNION
-            SELECT DISTINCT rfid, dept_id as deptId FROM eqpt_equipment_info
+        SELECT DISTINCT rfid, create_user_dept as deptId FROM eqpt_system_rfid
+        UNION
+        SELECT DISTINCT rfid, dept_id as deptId FROM eqpt_equipment_info
         )
 
         SELECT
-            r.rfid as rfid,
-            r.deptId as deptId,
-            if(e.id is null,"0","1") as usageStatus,
-            e.equipment_no as equipmentNo,
-            e.equipment_name as equipmentName,
-            e.use_position as usePosition,
-            e.director_name as directorName
+        r.rfid as rfid,
+        r.deptId as deptId,
+        if(e.id is null,"0","1") as usageStatus,
+        e.equipment_no as equipmentNo,
+        e.equipment_name as equipmentName,
+        e.use_position as usePosition,
+        e.director_name as directorName
         FROM
-            r left join eqpt_equipment_info e on r.rfid = e.rfid
+        r left join eqpt_equipment_info e on r.rfid = e.rfid
         <where>
             <if test="ew != null">
                 ${ew.sqlSegment}
             </if>
-        </where>
+        </where>) A
     </select>
 
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentGroupInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentGroupInfoServiceImpl.java
index cc3e86c..4a89b12 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentGroupInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentGroupInfoServiceImpl.java
@@ -67,7 +67,7 @@
     public Page<EquipmentGroupInfo> listPage(Page<EquipmentGroupInfo> page, String groupName) {
         QueryWrapper<EquipmentGroupInfo> queryWrapper = new QueryWrapper<>();
         if (StrUtil.isNotEmpty(groupName)) {
-            queryWrapper.like("group_name", groupName);
+            queryWrapper.like("binary group_name", groupName);
         }
         return this.page(page, queryWrapper);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
index 44326e8..f8c97f1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
@@ -82,6 +82,7 @@
     public Page<EquipmentInfo> listPage(Page<EquipmentInfo> page, EquipmentQueryForm queryForm) {
         QueryWrapper<EquipmentInfo> queryWrapper = commonQuery(queryForm);
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("dept_id");
         List<EquipmentInfo> list = this.baseMapper.selectListPage(page, dataScope, queryWrapper);
         list.forEach(this::warpEquipmentInfo);
         page.setRecords(list);
@@ -102,6 +103,7 @@
     public List<EquipmentInfo> list(EquipmentQueryForm queryForm) {
         QueryWrapper<EquipmentInfo> queryWrapper = commonQuery(queryForm);
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("dept_id");
         List<EquipmentInfo> list = this.baseMapper.selectList(dataScope, queryWrapper);
         list.forEach(this::warpEquipmentInfo);
         return list;
@@ -361,6 +363,7 @@
         QueryWrapper<EquipmentInfo> queryWrapper = commonQuery(queryForm);
         queryWrapper.le("certificate_valid", calendar.getTime());
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("dept_id");
         List<EquipmentInfo> list = this.baseMapper.selectListPage(page, dataScope, queryWrapper);
         list.forEach(this::warpEquipmentInfo);
         page.setRecords(list);
@@ -375,6 +378,7 @@
         QueryWrapper<EquipmentInfo> queryWrapper = commonQuery(queryForm);
         queryWrapper.le("certificate_valid", calendar.getTime());
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("dept_id");
         List<EquipmentInfo> list = this.baseMapper.selectList(dataScope, queryWrapper);
         list.forEach(this::warpEquipmentInfo);
         return list;