From eb581aa70ea8498e9199fbc34115c18b96138cd1 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sat, 20 Aug 2016 01:16:00 +0700 Subject: [PATCH] IDEMPIERE-1138:Broadcast Message Problems NPE when close message dialog --- .../src/org/adempiere/webui/panel/BroadcastMessageWindow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java index 0c945b5f0b..24a50569df 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java @@ -53,7 +53,7 @@ import org.zkoss.zul.South; */ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup,EventListener{ /** - * + * */ private static final long serialVersionUID = 1849434312706721390L; @@ -318,7 +318,7 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup public MNote getMNote(MBroadcastMessage mbMessage) { MNote note =null; if(!mbMessage.getBroadcastType().equals(MBroadcastMessage.BROADCASTTYPE_Immediate)){ - String sql = "SELECT * FROM AD_Note WHERE AD_BroadcastMessage_ID = ? AND AD_User_ID = ? AND AD_Client_ID = ?"; + String sql = "SELECT * FROM AD_Note WHERE AD_BroadcastMessage_ID = ? AND AD_User_ID = ? AND AD_Client_ID in (?, 0)"; PreparedStatement pstmt = null; ResultSet rs=null; try {