Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2023-01-16 09:59:30 +08:00
commit db620ea454
1 changed files with 1 additions and 1 deletions

View File

@ -1904,7 +1904,7 @@
</otherwise>
</choose>
<if test="deptId != null and deptId != ''">
AND sd.name = #{deptId}
AND sd.id = #{deptId}
</if>
<if test="region != null and region != ''">
AND sd.district = #{region}