b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔀 合并票 06 后端未分配组织筛选

Browse Source
This commit is contained in:
weicw
2026-10-25 19:50:58 +08:00
parent 9d55b9e95c ceccb40cd7
commit 46b71faadf
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/DriverMapper.xml
+11 -2
View File
@@ -170,8 +170,17 @@
AND driver_type = #{driver.driverType}
</if>
<if test="driver.organizationName != null and driver.organizationName != ''">
<bind name="organizationNameLike" value="'%' + driver.organizationName + '%'"/>
AND organization_name LIKE #{organizationNameLike}
<!-- 哨兵值来自前端 tms-erp-web/src/mixins/organization-search.js 的 UNASSIGNED_ORG_FILTER；
改这里必须同步该常量与 TransportVehicleMapper.xml 的同名分支 -->
<choose>
<when test="'__UNASSIGNED_ORG__'.equals(driver.organizationName)">
AND (organization_name IS NULL OR organization_name = '')
</when>
<otherwise>
<bind name="organizationNameLike" value="'%' + driver.organizationName + '%'"/>
AND organization_name LIKE #{organizationNameLike}
</otherwise>
</choose>
</if>
<if test="driver.status != null">
AND status = #{driver.status}
blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/TransportVehicleMapper.xml
+11 -2
View File
@@ -117,8 +117,17 @@
<sql id="QueryCondition">
is_deleted = 0
<if test="vehicle.organizationName != null and vehicle.organizationName != ''">
<bind name="organizationNameLike" value="'%' + vehicle.organizationName + '%'"/>
AND organization_name LIKE #{organizationNameLike}
<!-- 哨兵值来自前端 tms-erp-web/src/mixins/organization-search.js 的 UNASSIGNED_ORG_FILTER；
改这里必须同步该常量与 DriverMapper.xml 的同名分支 -->
<choose>
<when test="'__UNASSIGNED_ORG__'.equals(vehicle.organizationName)">
AND (organization_name IS NULL OR organization_name = '')
</when>
<otherwise>
<bind name="organizationNameLike" value="'%' + vehicle.organizationName + '%'"/>
AND organization_name LIKE #{organizationNameLike}
</otherwise>
</choose>
</if>
<if test="vehicle.useDepartment != null and vehicle.useDepartment != ''">
<bind name="useDepartmentLike" value="'%' + vehicle.useDepartment + '%'"/>