Merge remote-tracking branch 'origin/dev' into xizang-changyun

yupeng

2025-03-26 d1cc113ac2ce39f6a06ab0a838ccf538766580c2

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

@@ -55,6 +55,9 @@
            <if test="req.leaseStatus == 1">
                and (t2.start_time is null) and t1.lease_status = 1
            </if>
            <if test="req.businessDeptId != null and req.businessDeptId != '' and req.businessDeptId!='0'">
                and t1.business_dept_id = #{req.businessDeptId}
            </if>
            AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        order by t1.create_time desc