Преглед изворни кода

Merge remote-tracking branch 'origin/master'

Qchen пре 10 месеци
родитељ
комит
9450af97d0

+ 1 - 0
platform/src/main/resources/mapper/PtlAgreementAttributionMapper.xml

@@ -34,6 +34,7 @@
         <if test="ptlAgreementAttributionQueryVo.username != null and ptlAgreementAttributionQueryVo.username != ''">
             and paa.username like concat('%',#{ptlAgreementAttributionQueryVo.username},'%')
             or paa.user_abbr like concat('%',#{ptlAgreementAttributionQueryVo.username},'%')
+            or eic.name_simple like concat('%',#{ptlAgreementAttributionQueryVo.username},'%')
         </if>
         <if test="ptlAgreementAttributionQueryVo.quoteStatus != null and ptlAgreementAttributionQueryVo.quoteStatus != ''">
             and paa.quote_status = #{ptlAgreementAttributionQueryVo.quoteStatus}

+ 1 - 1
platform/src/main/resources/mapper/PtlAgreementUrlMapper.xml

@@ -18,7 +18,7 @@
             and pau.company_id = #{ptlAgreementUrlVo.companyId}
         </if>
         <if test="ptlAgreementUrlVo.name != null and ptlAgreementUrlVo.name != ''">
-            and pau.name = #{ptlAgreementUrlVo.name}
+            and pau.name like concat('%',#{ptlAgreementUrlVo.name},'%')
         </if>
     </select>
 </mapper>