Merge remote-tracking branch 'origin/main'

This commit is contained in:
2026-02-05 19:18:40 +08:00
2 changed files with 4 additions and 4 deletions

View File

@@ -702,7 +702,7 @@
#{disciplineId}
</foreach>
)
or discipline = '' or discipline = null
or discipline = '' or discipline is null
</if>
</where>
</select>

View File

@@ -151,7 +151,7 @@
#{disciplineId}
</foreach>
)
or discipline = '' or discipline = null
or discipline = '' or discipline is null
</if>
<if test='req.sortOrder != null and req.sortOrder == "0"'>
@@ -588,7 +588,7 @@
#{disciplineId}
</foreach>
)
or discipline = '' or discipline = null)
or discipline = '' or discipline is null)
</if>
<!-- <if test='req.sortOrder != null and req.sortOrder == "0"'>-->
@@ -704,7 +704,7 @@
#{disciplineId}
</foreach>
)
or discipline = '' or discipline = null)
or discipline = '' or discipline is null)
</if>
<!-- <if test='req.sortOrder != null and req.sortOrder == "0"'>-->