yys 修改循环依赖bug

maven

8 小时以前 8a5965a2550f608f40e308769b50b568cabc6414

 src/main/resources/mapper/device/DeviceRepairMapper.xml

@@ -6,26 +6,59 @@
<mapper namespace="com.ruoyi.device.mapper.DeviceRepairMapper">

    <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
        select dr.*,
        select dr.id,
               dr.device_ledger_id,
                dr.repair_time,
                dr.repair_name,
                dr.remark,
                dr.maintenance_name,
                dr.maintenance_time,
                dr.maintenance_result,
                dr.status,
                dr.create_time,
                dr.update_time,
                dr.create_user,
                dr.update_user,
               dr.tenant_id,
               dl.device_name,
               dl.device_model
        from device_repair dr
        left join device_ledger dl on dr.device_ledger_id = dl.id
        <where>
            1 = 1
            <if test="deviceRepairDto.deviceName != null">
                and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
            </if>
            <if test="deviceRepairDto.deviceModel != null">
                and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
            </if>
            <if test="deviceRepairDto.remark != null">
                and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
            </if>
            <if test="deviceRepairDto.maintenanceName != null">
                and dr.maintenance_name like concat('%',#{deviceRepairDto.maintenanceName},'%')
            </if>
        </where>
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
        select dr.*,
        select dr.id,
               dr.device_ledger_id,
               dr.repair_time,
               dr.repair_name,
               dr.remark,
               dr.maintenance_name,
               dr.maintenance_time,
               dr.maintenance_result,
               dr.status,
               dr.create_time,
               dr.update_time,
               dr.create_user,
               dr.update_user,
               dr.tenant_id,
               dl.device_name,
               dl.device_model
        from device_repair dr
        left join device_ledger dl on dr.device_ledger_id = dl.id
                 left join device_ledger dl on dr.device_ledger_id = dl.id
        where dr.id = #{id}
    </select>