bug52676树形验重+52782搜索年款号

2022-05-23 15:08:13 +08:00
parent 398ff89fcd
commit 44533fd7e0
3 changed files with 23 additions and 5 deletions
@@ -59,10 +59,10 @@
                <!--搜索条件:项目名称,包含%,单独搜索-->
                <choose>
                    <when test='params.projectName != null and params.projectName != "" and params.projectName.contains("%")'>
-                        and pni.project_name like '%1%%' escape '1'
+                        and( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1')
                    </when>
                    <otherwise>
-                        and pni.project_name like concat('%',#{params.projectName},'%')
+                        and(pni.project_name like concat('%',#{params.projectName},'%') or pyni.year_name like ('%',#{params.projectName},'%'))
                    </otherwise>
                </choose>
            </if>