Cross Data being displayed ( In Site Code Details link display wrong site...

Cross Data being displayed ( In Site Code Details link display wrong site details in Purchase Order screen )

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@197392 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/DataModelComponent.java

@@ -54,6 +54,7 @@ public class DataModelComponent extends E12DataModelComponent
 		String imgPath ="";
 		try
 		{
+			UserInfoBean userInfo = new UserInfoBean(userInfoStr);
 			Connection myCon = null;
 			PreparedStatement pstmt = null;
 			String finalQuery="";
@@ -62,13 +63,15 @@ public class DataModelComponent extends E12DataModelComponent
 			String dataModelKey = "";
 			if( "".equals(fieldValue) )
 			{
-				dataModelKey = dataModelName;
+				//Added By Pankaj T. on 19-02-19 add enterprise in key for uniqueness to avoid data conflict
+				dataModelKey = dataModelName.concat("_"+userInfo.getEnterprise());
 			}
 			else
 			{
-				dataModelKey = dataModelName.concat("_"+fieldValue);
+				//Added By Pankaj T. on 19-02-19 add enterprise in key for uniqueness to avoid data conflict
+				dataModelKey = dataModelName.concat("_"+fieldValue).concat("_"+userInfo.getEnterprise());
 			}
-
+			BaseLogger.log("3", userInfo, null,"inside getDMDataJson dataModelKey ==> ["+dataModelKey+"]");
 			if( CommonConstants.CACHE_OPT != 0 && infinispanLocalObj.FormDataContains(dataModelKey) )
 			{
 				returnJsonData = infinispanLocalObj.getFormData(dataModelKey).toString();
@@ -231,7 +234,7 @@ public class DataModelComponent extends E12DataModelComponent
 					{
 						//BaseLogger.log("3", userInfo, null,"Executing Query...........");
 						ConnDriver connDriver = new ConnDriver();
-						UserInfoBean userInfo = new UserInfoBean(userInfoStr);
+						//UserInfoBean userInfo = new UserInfoBean(userInfoStr);
 						//JSONArray jsonArray = new JSONArray();
 						String transDB = userInfo.getTransDB();
 						BaseLogger.log("3", userInfo, null,"inside createDataJson transDB ==> "+transDB);