Merge remote-tracking branch 'origin/master'

无关风月

13 小时以前 92ff484325b9af3afd081ec079f74fbc6dd3fea8

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

@@ -136,7 +136,7 @@
            <if test="query != null and query.assetTypeId != null">
                AND (am.asset_type_id = #{query.assetTypeId} OR FIND_IN_SET(#{query.assetTypeId},at.parent_id))
            </if>
            <if test="query != null and query.ownershipDeptId != null">
            <if test="query != null and query.ownershipDeptId != null and query.ownershipDeptId != 100 and query.ownershipDeptId != 102">
                AND am.ownership_dept_id = #{query.ownershipDeptId}
            </if>
            <if test="query != null and query.assetStatus != null and query.assetStatus != ''">