Merge branch 'dev'
This commit is contained in:
commit
4a91e17e5e
|
@ -1904,7 +1904,7 @@
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
<if test="deptId != null and deptId != ''">
|
<if test="deptId != null and deptId != ''">
|
||||||
AND sd.name = #{deptId}
|
AND sd.id = #{deptId}
|
||||||
</if>
|
</if>
|
||||||
<if test="region != null and region != ''">
|
<if test="region != null and region != ''">
|
||||||
AND sd.district = #{region}
|
AND sd.district = #{region}
|
||||||
|
|
Loading…
Reference in New Issue