Merge branch 'develop'

src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java

@@ -34,11 +34,11 @@ public interface RiskAttentionMerchantsMapper {
     PageList<JSONObject> query(JSONObject params, PageBounds pagination);
 
     @Select("SELECT client_moniker FROM risk_attention_merchants " +
-            "WHERE (abn = #{abn} ) OR (acn = #{acn} ) " +
+            "WHERE ((abn = #{abn} ) OR (acn = #{acn} ) " +
             "   OR (contact_phone = #{contact_phone} ) " +
             "   OR (contact_person = #{contact_person} ) " +
             "   OR (client_moniker = #{client_moniker} ) " +
-            "   OR (bank_account_no = #{bank_account_no} ) AND is_valid=1")
+            "   OR (bank_account_no = #{bank_account_no} )) AND is_valid=1")
     List<JSONObject> listRiskySimilarMerchants(JSONObject params);
 
 }