Merge remote-tracking branch 'origin/develop' into develop

src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java

@@ -74,9 +74,9 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
         List<JSONObject> clientLogs = actMonDelaySettleMapper.clientLog(client_id);
         JSONObject res = new JSONObject();
         res.put("operation_pause",false);
-        Boolean apply = true;
-        if (clientLogs.isEmpty()) {
-            apply = false;
+        Boolean apply = false;
+        if (!clientLogs.isEmpty()) {
+            apply = true;
             res.put("cancel_waring",messageSource.getMessage("sys.mondelay.cancel.waring", null, RequestEnvironment.getLocale()));
         }
         if (new Date().compareTo(act.getDate("active_date")) < 0) {