Updated for default value changes

webitm-dashboard/ibase/dashboard/common/hibernate/dao/DashboardUtil.java

@@ -76,6 +76,7 @@ public class DashboardUtil
 				userSite =userInfo.getSiteCode();
 				empCode = userInfo.getEmpCode();
 				profileId = userInfo.getProfileId();
+				loginCode = userInfo.getLoginCode();
 			}
 			System.out.println("userTranDB =" + userTranDB);
 			CommonConstants.setIBASEHOME();
@@ -988,31 +989,24 @@ public class DashboardUtil
 			}
 			//TO FETCH SITECODE OF USER LOGGED IN
 			else if(defaultValue !=null && "CURRENT_SITE".equalsIgnoreCase(defaultValue.toString())) {
-				filterObj.put("default_value",checkNull(userSite).trim()+",");
+				filterObj.put("default_value",checkNull(userSite));
 				System.out.println("toget user site code => "+filterObj);
 			}
 			//TO FETCH EMPCODE OF USER LOGGED IN
 			else if(defaultValue !=null && "EMP_CODE".equalsIgnoreCase(defaultValue.toString())) {
-				filterObj.put("default_value",checkNull(empCode).trim()+",");
+				filterObj.put("default_value",checkNull(empCode));
 				System.out.println("toget user emp_code => "+filterObj);
 			}
 			//TO FETCH PERIOD CODE  OF USER LOGGED IN
 			else if(defaultValue !=null && "CURRENT_PERIOD".equalsIgnoreCase(defaultValue.toString())) {
-				filterObj.put("default_value",checkNull(prd_code).trim()+",");
-				System.out.println("toget user prd_codeprd_code => "+filterObj);
+				filterObj.put("default_value",checkNull(prd_code));
+				System.out.println("toget user prd_code => "+filterObj);
 			}
-			
-			
-			//TO FETCH EMPCODE CODE OF USER LOGGED IN
-			else if(defaultValue !=null && "EMP_CODE".equalsIgnoreCase(defaultValue.toString())) {
-				filterObj.put("default_value",checkNull(empCode).trim()+",");
-				System.out.println("toget user emp_code => "+filterObj);
-			}
-			
+			//TO FETCH LOGIN_CODE OF USER LOGGED IN
 			else if(defaultValue !=null && "LOGIN_CODE".equalsIgnoreCase(defaultValue.toString())) 
 			{
-				System.out.println("LOGIN_CODE for column value in hcp Cals => "+this.loginCode);
-				filterObj.put("default_value",this.loginCode.trim() +",");
+				System.out.println("LOGIN_CODE for column value in hcp Cals => "+loginCode);
+				filterObj.put("default_value",loginCode);
 				System.out.println("toget user login code in hcp calls ["+ filterObj +"]");
 			}