Merge branch 'dev-0327' into dev

mitao

2025-03-31 12350e84bd9b7cea84e2ad31338172883a020840

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

@@ -68,7 +68,7 @@
                    #{item}
                </foreach>
            </if>
            <if test="businessDeptId!=null and businessDeptId !='' and businessDeptId != '0'">
            <if test="businessDeptId!=null and businessDeptId !='' and businessDeptId != 0">
                and t1.business_dept_id = #{businessDeptId}
            </if>
            AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}