部分功能排除经营性租赁合同开发

src/main/webapp/WEB-INF/classes/cont/CON620/con_contract_dun_for_query.lwm

@@ -776,6 +776,7 @@
         <!-- <bm:data-filter name="overdue_days" enforceOperations="query" expression="t1.overdue_days &gt; 0"/> -->
         <!-- <bm:data-filter enforceOperations="query" expression="exists (select 1 from con_contract_cashflow where contract_id = t1.contract_id and cf_type = 9 and due_amount != nvl(received_amount,0) and generated_source not in (&apos;CREATE&apos;))"/> -->
         <bm:data-filter enforceOperations="query" expression="t1.data_class = &apos;NORMAL&apos;"/>
+        <bm:data-filter enforceOperations="query" expression="t1.division != &apos;95&apos;"/>
         <!--<bm:data-filter enforceOperations="query" expression="exists (select 1 from con_contract where contract_id = t1.contract_id and created_by = ${/session/@user_id})"/>-->
     </bm:data-filters>
 </bm:model>

src/main/webapp/WEB-INF/classes/cont/CON620/con_contract_dun_for_repur_query.lwm

@@ -372,7 +372,7 @@
     </bm:operations>
     <bm:query-fields>
         <bm:query-field name="contract_number"
-                        queryExpression="contract_number like &apos;%&apos;|| ${@contract_number}||&apos;%&apos;"/>
+                        queryExpression="contract_number like &apos;%&apos;|| ${@contract_number} ||&apos;%&apos;"/>
         <!--<bm:query-field name="bp_id_tenant" queryExpression="t1.bp_id_tenant = ${@bp_id_tenant}"/>-->
         <bm:query-field name="bp_id_tenant_desc" queryExpression="t1.bp_id_tenant_desc like &apos;%&apos;|| ${@bp_id_tenant_desc}||&apos;%&apos;"/>
         <!--        <bm:query-field name="contract_name" queryExpression="t1.contract_name like ${@contract_name} "/>-->
@@ -425,5 +425,6 @@
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter enforceOperations="query" expression="t1.data_class = &apos;NORMAL&apos;"/>
+        <bm:data-filter enforceOperations="query" expression="t1.division != &apos;95&apos;"/>
 </bm:data-filters>
 </bm:model>

src/main/webapp/WEB-INF/classes/cont/CON_ET001/con_early_termination_query.lwm

@@ -135,10 +135,13 @@
                             hlc.enabled_flag  = 'Y'
                             ) lease_channel_n,
                             t.division,
-                            (SELECT  v.code_value_name
-                            FROM sys_code_values_v v
-                            where v.code = 'DIVISION'
-                            and v.code_value = t.division
+                            (SELECT
+                            t2.description
+                            FROM
+                            hls_division t2
+                            WHERE
+                            t2.enabled_flag = 'Y' AND
+                            t2.division     = t.division
                             ) division_n
                             FROM
                             con_contract t,
@@ -151,7 +154,22 @@
                             t.data_class        = 'NORMAL' AND
                             dt.document_type(+) = t.document_type AND
                             t.division != '95'
-
+                            and (t.bp_id_agent_level1 = (select t.bp_id from sys_user s, exp_employees e, exp_employee_assigns a, exp_org_position pp,hls_bp_master t
+                                                         where a.position_id = pp.position_id
+                                                           and a.employee_id = e.employee_id
+                                                           and s.employee_id = e.employee_id
+                                                           and pp.unit_id = t.unit_id
+                                                           and a.enabled_flag = 'Y'
+                                                           and e.enabled_flag = 'Y'
+                                                           and a.primary_position_flag = 'Y'
+                                                           and pp.enabled_flag = 'Y'
+                                                           and t.bp_type = 'AGENT'
+                                                           and s.user_id = ${/session/@user_id}) or  not exists (select 1
+                                                                                                                  from sys_user_role_groups g, sys_role r
+                                                                                                                 where g.role_id = r.role_id
+                                                                                                                   and g.user_id = ${/session/@user_id}
+                                                                                                                   and r.role_code in ('0018','0019')
+                                                                                                                   and trunc(sysdate) <= nvl(g.end_date, trunc(sysdate))))
                         ) t1 #WHERE_CLAUSE# #ORDER_BY_CLAUSE#
             ]]></bm:query-sql>
         </bm:operation>

src/main/webapp/WEB-INF/server-script/layoutconfig/con_buyback_01_g_buy_back_con_queryfields.js

@@ -4,13 +4,16 @@ var override_queryfields = [
 			queryoperator : "="
 		}
 
-
-
 ];
 var add_datafilters = [{
     name : 'bp_id_agent_level1',
     expression : "Not Exists (Select 1 From hls_bp_master hm Where hm.bp_id = t1.bp_id_agent_level1 And nvl(hm.is_constru_unit,'N') = 'Y')"
-}];
+},
+	{
+		name : 'division',
+		expression : "t1.division!= 95"
+	}
+];
 
 override();
 add_datafilter();