Merge remote-tracking branch 'origin/master'

mitao

5 天以前 291a72bf35e2d39b816abc0ebf085cfa9da3ee06

 ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml

@@ -20,7 +20,8 @@
    <!-- 分页查询：资产入库申请列表（关联审批记录与资产类型） -->
    <select id="selectApplicationStoragePage" resultType="com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePageVO">
        SELECT
            oas.id                               AS id,
            aaa.id                               AS id,
            oas.asset_type_id                    AS assetTypeId,
            aaa.dept_name                        AS deptName,
            aaa.application_code                 AS applicationCode,
            oas.title                            AS title,
@@ -56,9 +57,9 @@
                   end as useName


               from asset_main t1
                             left join asset_type t2 on t3.id = t1.asset_type_id
                             left join t_dept t3 on t4.id = t3.ownership_dept_id
               from oa_approval_application_storage_asset t1
                             left join asset_type t2 on t2.id = t1.asset_type_id
                             left join t_dept t3 on t3.id = t1.ownership_dept_id
        where t1.approval_application_id = #{query.approvalApplicationId}
        order by t1.create_time  desc