Merge branch 'refs/heads/dev_qinhongzhan' into dev

# Conflicts:
#	mhd-auth/src/main/resources/bootstrap.yml
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
#	mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java
#	mhd-user-center/src/main/resources/bootstrap.yml
#	mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
#	mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java

mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml

@@ -97,6 +97,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <if test="accountInformation != null  and accountInformation != ''">
             and account_information like concat('%', #{accountInformation}, '%')
+        </if>
+        <!-- 无论什么情况，organization_name 都不能为空，也不能为空字符串 -->
+        and organization_name IS NOT NULL
+        and organization_name &lt;&gt; ''
+        and LENGTH(TRIM(organization_name)) > 0
+        <!-- 组织ID过滤条件：如果设置了organizationId，则按组织ID精确匹配 -->
+        <if test="organizationId != null ">
+            and organization_id = #{organizationId}
+        </if>
+        <!-- 一级组织ID过滤条件：如果设置了topOrganizationId，则按一级组织ID匹配 -->
+        <if test="topOrganizationId != null ">
+            and top_organization_id = #{topOrganizationId}
+        </if>
+        <!-- 组织名称模糊查询条件：如果前端传入了组织名称，则按组织名称模糊匹配 -->
+        <if test="organizationName != null and organizationName != ''">
+            and organization_name LIKE CONCAT('%',#{organizationName},'%')
         </if>
             order by create_time desc
         </where>