Merge branch 'develop'

master
eason.qian 7 years ago
commit b169e046b4

@ -2071,7 +2071,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
throw new InvalidShortIdException(); throw new InvalidShortIdException();
} }
checkOrgPermission(manager, client); checkOrgPermission(manager, client);
if (!StringUtils.isNotBlank(master_merchant)) { if (StringUtils.isNotBlank(master_merchant)) {
//throw new NotFoundException("Invalid Input"); //throw new NotFoundException("Invalid Input");
JSONObject master_client = getClientInfoByMoniker(master_merchant); JSONObject master_client = getClientInfoByMoniker(master_merchant);
if (master_client == null) { if (master_client == null) {

Loading…
Cancel
Save