fix: default orgid=1 when manager org is null

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -789,10 +789,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         partner.put("ali_sub_merchant_id", registery.getClientMoniker());
         partner.put("credential_code", RandomStringUtils.random(32, true, true));
         partner.put("creator", manager.getString("manager_id"));
-        int orgId = manager.getIntValue("org_id");
+        int orgId = manager.getInteger("org_id") == null ? 1 : manager.getIntValue("org_id");
         partner.put("org_id", orgId);
         JSONObject org = orgMapper.findOne(orgId);
-        Assert.notNull(orgId, "Merchant Org shall not be null");
         if (StringUtils.isNotEmpty(registery.getLogoId())) {
             partner.put("logo_url", attachmentClient.getFileUrl(registery.getLogoId()));
             partner.put("logo_thumbnail", attachmentClient.getThumbnail(registery.getLogoId(), 600).getString("url"));
@@ -1974,7 +1973,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                     json.put("overseas_rate_value", subRateObject(extRates.getBigDecimal("international_rate_value"), config.getIntValue("clean_days") + 1));
                 });
                 newConfig.put("ext_rates", extRateParams.toJSONString());
-            }else{
+            } else {
                 List<JSONObject> existRate = clientRateMapper.listCurrentClientRates(clientId, config.getDate("active_time"), channel);
                 for (JSONObject rateLog : existRate) {
                     rateLog.put("expiry_time", DateUtils.addDays(config.getDate("active_time"), -1));