Merge remote-tracking branch 'origin/master'

7 years ago · c9234149f1
parent 6253447003 95dff547d2
commit c9234149f1
1 changed files with 6 additions and 2 deletions
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@ -1175,8 +1175,12 @@ public class RetailAppServiceImp implements RetailAppService {
        deviceSupport.findRegister(clientType);
        JSONObject res = royalPayCMSSupport.listArticles("app_ad", false, true, 1, 10);
        JSONArray acts = res.getJSONArray("data");
-        int selectNo = RandomUtils.nextInt(0,acts.size());
-        return acts.getJSONObject(selectNo);
+        if (acts.size()>0){
+            int selectNo = RandomUtils.nextInt(0,acts.size());
+            return acts.getJSONObject(selectNo);
+        }
+        return null;
+
    }

    private static boolean mathchLetterorNum(String str) {