Request_id-F15BSUN002

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

webitm-fin/ibase/webitm/ejb/fin/AssetclassIC.java

@@ -100,10 +100,14 @@ public class AssetclassIC  extends ValidatorEJB implements AssetclassICLocal ,As
 							System.out.println("Loadddddddddddddddddddddd");
 						String id = genericUtility.getColumnValue("item_ser", dom);
 						String id1 = genericUtility.getColumnValue("grp_code", dom);
-						String Sql = "SELECT COUNT(1) AS COUNT FROM ASSET_CLASS WHERE ITEM_SER=? AND GRP_CODE=?";
+						String id2 = genericUtility.getColumnValue("asset_class",dom);
+						String id3= genericUtility.getColumnValue("fin_entity",dom);
+						String Sql = "SELECT COUNT(1) AS COUNT FROM ASSET_CLASS WHERE ITEM_SER=? AND GRP_CODE=?AND ASSET_CLASS=? AND FIN_ENTITY=?";
 					    pstmt = conn.prepareStatement(Sql);
 					    pstmt.setString(1,id);
 					    pstmt.setString(2,id1);
+					    pstmt.setString(3,id2);
+					    pstmt.setString(4,id3);
 					    rs = pstmt.executeQuery();
 						System.out.println("Sql" + Sql);
 						if (rs.next()) {
@@ -161,7 +165,13 @@ public class AssetclassIC  extends ValidatorEJB implements AssetclassICLocal ,As
 						}
 						if(childNodeName.equalsIgnoreCase( "fin_entity" ))
 						{
+							if (childNode.getFirstChild() == null) 
+							{
+								errString = getErrorString("fin_entity", "VMFINENULL", userId);
+								break;
+							} 
 							finEntity = this.genericUtility.getColumnValue("fin_entity", dom);
+							
 							if(finEntity != null && finEntity.trim().length() > 0)
 							{
 								sql = "select count(*) from finent where fin_entity = ?";