Merge branch 'develop_master' into 'FOTON'
Develop master See merge request LiuChao/foton-slrs-system-rest!336
This commit is contained in:
+3
@@ -1135,6 +1135,9 @@
|
||||
and (
|
||||
(trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
|
||||
SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
|
||||
or trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ',''))
|
||||
|
||||
|
||||
<!-- and SAR_STANDARDS_INFO.STAND_YEAR = ''-->
|
||||
<!-- or (stand_name like concat(concat('%',#{page.standNumber}),'%')) -->
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user