From 5c2e8f4387bfb1aa8b4b995ce25c53981543aaa1 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 18 Oct 2019 13:50:45 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=95=86=E6=88=B7keyword=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=A2=9E=E5=8A=A0email=20&&=20address?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                          |  2 +-
 .../manage/mappers/system/ClientMapper.xml       | 16 ++++++++++++++--
 .../partner/templates/partner_compliance.html    |  2 ++
 .../payment/partner/templates/partners.html      |  2 ++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8748c3129..a76b6932c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.38</version>
+    <version>1.2.39</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
index d662f1615..14649d122 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
@@ -142,7 +142,7 @@
                 <if test="text_type=='all'">
                     and (c.client_moniker=#{search_text} or c.short_name like #{name_pattern} or c.company_name like
                     #{name_pattern} or c.business_name like #{name_pattern} or c.remark like
-                    #{name_pattern} or c.contact_email=#{search_text})
+                    #{name_pattern} or c.contact_email=#{search_text} or c.address = #{search_text})
                 </if>
                 <if test="text_type=='client_moniker'">
                     and c.client_moniker=#{search_text}
@@ -162,6 +162,12 @@
                 <if test="text_type=='remark'">
                     and c.remark like #{name_pattern}
                 </if>
+                <if test="text_type=='email'">
+                    and c.contact_email like #{name_pattern}
+                </if>
+                <if test="text_type=='address'">
+                    and c.address like #{name_pattern}
+                </if>
             </if>
             <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
             <if test="org_ids!=null">and c.org_id in
@@ -317,7 +323,7 @@
                 <if test="text_type=='all'">
                     and (c.client_moniker=#{search_text} or c.short_name like #{name_pattern} or c.company_name like
                     #{name_pattern} or c.business_name like #{name_pattern} or c.remark like
-                    #{name_pattern} or c.contact_email=#{search_text})
+                    #{name_pattern} or c.contact_email=#{search_text} or c.address = #{search_text})
                 </if>
                 <if test="text_type=='client_moniker'">
                     and c.client_moniker=#{search_text}
@@ -337,6 +343,12 @@
                 <if test="text_type=='remark'">
                     and c.remark like #{name_pattern}
                 </if>
+                <if test="text_type=='email'">
+                    and c.contact_email like #{name_pattern}
+                </if>
+                <if test="text_type=='address'">
+                    and c.address like #{name_pattern}
+                </if>
             </if>
             <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
             <if test="org_ids!=null">and c.org_id in
diff --git a/src/main/ui/static/payment/partner/templates/partner_compliance.html b/src/main/ui/static/payment/partner/templates/partner_compliance.html
index 747b83900..18d6bfe7a 100644
--- a/src/main/ui/static/payment/partner/templates/partner_compliance.html
+++ b/src/main/ui/static/payment/partner/templates/partner_compliance.html
@@ -84,6 +84,8 @@
                                                     <option value="company_name">Company Name</option>
                                                     <option value="business_name">Business Name</option>
                                                     <option value="remark">Remark</option>
+                                                    <option value="email">Email</option>
+                                                    <option value="address">Address</option>
                                                 </select>
                                             </label>
                                             <div class="col-xs-8 col-sm-4">
diff --git a/src/main/ui/static/payment/partner/templates/partners.html b/src/main/ui/static/payment/partner/templates/partners.html
index b33cea5ee..7681d526b 100644
--- a/src/main/ui/static/payment/partner/templates/partners.html
+++ b/src/main/ui/static/payment/partner/templates/partners.html
@@ -83,6 +83,8 @@
                                                     <option value="company_name">Company Name</option>
                                                     <option value="business_name">Business Name</option>
                                                     <option value="remark">Remark</option>
+                                                    <option value="email">Email</option>
+                                                    <option value="address">Address</option>
                                                 </select>
                                             </label>
                                             <div class="col-xs-8 col-sm-4">