Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
45dc1bad08
|
@ -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}
|
||||
|
|
Loading…
Reference in New Issue