Commit 8704ef09 authored by mchaudhari's avatar mchaudhari

Solve space issue in acct_flt and def_flt column


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96229 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5a08c58f
...@@ -122,7 +122,7 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U ...@@ -122,7 +122,7 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
String key = null; String key = null;
String tWinName = null; String tWinName = null;
String tMenuName = null; String tMenuName = null;
String sqlStr = ""; String sqlStr = "", accFilt = "", defFilt = "";
try try
{ {
if(conn == null) if(conn == null)
...@@ -245,7 +245,7 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U ...@@ -245,7 +245,7 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
" ITM2MENU.LEVEL_3, " + " ITM2MENU.LEVEL_3, " +
" ITM2MENU.LEVEL_4, " + " ITM2MENU.LEVEL_4, " +
" ITM2MENU.LEVEL_5, " + " ITM2MENU.LEVEL_5, " +
" ITM2MENU.DESCR, USER_RIGHTS.RIGHTS, COALESCE(USER_RIGHTS.ACC_FILT,' ') AS ACC_FILT, COALESCE(USER_RIGHTS.DEF_FILT,' ') AS DEF_FILT , ITM2MENU.WIN_NAME" + " ITM2MENU.DESCR, USER_RIGHTS.RIGHTS, USER_RIGHTS.ACC_FILT, USER_RIGHTS.DEF_FILT, ITM2MENU.WIN_NAME" +
" FROM ITM2MENU LEFT OUTER JOIN USER_RIGHTS ON USER_RIGHTS.PROFILE_ID = ? " + " FROM ITM2MENU LEFT OUTER JOIN USER_RIGHTS ON USER_RIGHTS.PROFILE_ID = ? " +
" AND USER_RIGHTS.APPLICATION = ITM2MENU.APPLICATION "+ " AND USER_RIGHTS.APPLICATION = ITM2MENU.APPLICATION "+
" AND USER_RIGHTS.MENU_ROW = ITM2MENU.LEVEL_1 "+ " AND USER_RIGHTS.MENU_ROW = ITM2MENU.LEVEL_1 "+
...@@ -287,6 +287,10 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U ...@@ -287,6 +287,10 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
continue; continue;
} }
// added by mahesh
accFilt = rs.getString("ACC_FILT") == null ? "" : rs.getString("ACC_FILT").trim();
defFilt = rs.getString("DEF_FILT") == null ? "" : rs.getString("DEF_FILT").trim();
// end added by mahesh
retTabSepStrBuff.append("<Detail2>"); retTabSepStrBuff.append("<Detail2>");
//APPLICATION //APPLICATION
//retTabSepStrBuff.append(tApplication==null?"":rs.getString(1)).append("\t"); //retTabSepStrBuff.append(tApplication==null?"":rs.getString(1)).append("\t");
...@@ -321,8 +325,8 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U ...@@ -321,8 +325,8 @@ public class UserRightsPrc extends ProcessEJB implements UserRightsPrcLocal , U
retTabSepStrBuff.append("<rights>").append("<![CDATA[" + (rs.getString("RIGHTS")==null?" ":rs.getString("RIGHTS")) +"]]>").append("</rights>"); retTabSepStrBuff.append("<rights>").append("<![CDATA[" + (rs.getString("RIGHTS")==null?" ":rs.getString("RIGHTS")) +"]]>").append("</rights>");
// Added by mahesh on 16-06-2014 // Added by mahesh on 16-06-2014
retTabSepStrBuff.append("<acc_filt>").append("<![CDATA[" + rs.getString("ACC_FILT") +"]]>").append("</acc_filt>"); retTabSepStrBuff.append("<acc_filt>").append("<![CDATA[" + accFilt +"]]>").append("</acc_filt>");
retTabSepStrBuff.append("<def_filt>").append("<![CDATA[" + rs.getString("DEF_FILT") +"]]>").append("</def_filt>"); retTabSepStrBuff.append("<def_filt>").append("<![CDATA[" + defFilt +"]]>").append("</def_filt>");
// End of code added by mahesh // End of code added by mahesh
//WIN_NAME //WIN_NAME
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment