Merge branch 'develop_master' into 'FOTON'
Develop master See merge request LiuChao/foton-slrs-system-rest!309
This commit is contained in:
+2
-1
@@ -95,7 +95,8 @@
|
|||||||
and SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{lawsNumber}),'%')
|
and SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{lawsNumber}),'%')
|
||||||
</if>
|
</if>
|
||||||
<if test="numberName != null and numberName != ''">
|
<if test="numberName != null and numberName != ''">
|
||||||
and (LAWS_NAME like concat(concat('%',#{numberName}),'%')
|
and (SAR_LAWS_STAND_INFO.LAWS_NAME like concat(concat('%',#{numberName}),'%')
|
||||||
|
or SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{numberName}),'%')
|
||||||
or SAR_LAWS_STAND_INFO.LAWS_EN_NAME like concat(concat('%',#{numberName}),'%'))
|
or SAR_LAWS_STAND_INFO.LAWS_EN_NAME like concat(concat('%',#{numberName}),'%'))
|
||||||
</if>
|
</if>
|
||||||
<if test="lawsName != null and lawsName != ''">
|
<if test="lawsName != null and lawsName != ''">
|
||||||
|
|||||||
Reference in New Issue
Block a user