Merge branch 'feature/master' into feature/develop

src/main/resources/mybatis/business/BizFileUploadMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" prefixOverrides="AND" suffixOverrides="AND">
             <if test="deleted != null "> AND bfu.deleted = #{deleted}</if>
             <if test="type != null "> AND bfu.type = #{type}</if>
+            <if test="companyId != null "> AND bfu.company_id = #{companyId}</if>
             <if test="tenantVersionId == 4 "> and beo.tenant_id = #{tenantId} </if>
             <if test="tenantVersionId != 4 and tenantId != null "> AND bfu.tenant_id = #{tenantId}</if>
             <if test="fromTenantId != null and fromTenantId != ''"> AND bfu.tenant_id = #{fromTenantId} </if>