1.设备移交分页满bug

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper">
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto">
-        select
+          select
             jet.sequence_nbr AS sequenceNbr,
             jet.apply_no AS applyNo,
             jet.use_unit_credit_code AS useUnitCreditCode,
@@ -51,13 +51,13 @@
             CONCAT_WS('',ui.PROVINCE_NAME, ui.CITY_NAME, ui.COUNTY_NAME, ui.STREET_NAME, ui.ADDRESS) AS equAddress,
             ui.USE_INNER_CODE AS useInnerCode,
             oi.SUPERVISORY_CODE AS supervisoryCode,
-            tec2.name AS equCategory,
-            tec1.name AS equList,
-            tec.name AS equDefine,
             jet.create_date AS createDate,
             jet.next_execute_user_ids as nextExecuteUserIds,
             jet.create_user_id as createUserId,
-            jet.next_task_id as nextTaskId
+            jet.next_task_id as nextTaskId,
+           (select name from tz_equipment_category tec1 where tec1.code = ri."EQU_LIST") AS equList,
+           (select name from tz_equipment_category tec2 where tec2.code = ri."EQU_CATEGORY") AS equCategory,
+           (select name from tz_equipment_category tec3 where tec3.code = ri."EQU_DEFINE") AS equDefine
         FROM
             tzs_jg_equip_transfer jet
             LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
@@ -66,9 +66,6 @@
             LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = ete.equ_id
             LEFT JOIN idx_biz_jg_use_info ui ON ui.record = ete.equ_id
             LEFT JOIN idx_biz_jg_other_info oi ON oi.record = ete.equ_id
-            LEFT JOIN tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
-            LEFT JOIN tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
-            LEFT JOIN tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
         <where>
             jet.is_delete = false
             <if test="param != null ">