Merge branch 'develop'

src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm

@@ -60,7 +60,7 @@ select t.parent_company_id company_id
                         queryExpression="(t.bp_id_tenant = ${@bp_id} or t.bp_id_agent_level1 = ${@bp_id} or ((select bp_category from hls_bp_master where bp_id = ${@bp_id}) = 'VENDER'))"/>-->
         <bm:query-field name="bp_id" queryExpression="(Exists (Select 1
                   From hls_bp_master h, hls_bp_master_role hbr
-                 Where h.bp_id = ${@bp_id}
+                 Where h.bp_name in ( select hbm.bp_name from hls_bp_master hbm where hbm.bp_id= ${@bp_id})
                    and hbr.bp_id = h.bp_id
                    and hbr.bp_type = 'TENANT'
                    and h.bp_id = t.bp_id_tenant) Or not Exists