Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 030201887b4690e20b1f9ffae548ccd840e7077f

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

@@ -22,21 +22,23 @@
    <!-- 分页查询：资产领用申请列表（关联审批记录与资产类型） -->
    <select id="getPageByType" resultType="com.ruoyi.system.vo.asset.OaApprovalApplicationAssetPageVO">
        SELECT
            aaa.id                               AS id,
            aaa.application_code                 AS applicationCode,
            oaa.title                            AS title,
            aaa.dept_name                        AS deptName,
            aaa.applicant_name                   AS applicantName,
            aaa.id,
            aaa.application_code,
            CASE WHEN at2.level = 2 THEN at1.type_name ELSE at2.type_name END AS firstAssetTypeName,
            CASE WHEN at2.level = 2 THEN at2.type_name ELSE NULL END         AS secondAssetTypeName,
            oaa.operate_time                     AS operateTime,
            aaa.approval_status                  AS approvalStatus,
            oaa.return_status                     AS returnStatus,
            oaa.expect_return_date               AS expectReturnDate
            oaa.title,
            oaa.operate_time,
            aaa.approval_status,
            oaa.return_status,
            oaa.expect_return_date,
            su.nick_name AS applicantName,
            td.dept_name AS deptName
        FROM oa_approval_application_asset oaa
                 INNER JOIN oa_approval_applications aaa ON aaa.id = oaa.approval_application_id
                 LEFT JOIN asset_type at2 ON at2.id = oaa.asset_type_id
                 LEFT JOIN asset_type at1 ON at1.id = (CASE WHEN at2.level = 2 THEN at2.parent_id ELSE at2.id END)
                 LEFT JOIN sys_user su ON aaa.applicant_user_id = su.user_id
                 LEFT JOIN t_dept td ON aaa.dept_id = td.id
        <where>
            AND aaa.disabled = 0
            AND oaa.type = #{query.type}