Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into develop

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT104/csh_transaction_maintain_query.lwm

@@ -163,7 +163,7 @@
         <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
         <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
         <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
+        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like  &apos;%&apos;||${@bp_name_n}||&apos;%&apos; "/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_maintain_query.lwm

@@ -180,7 +180,7 @@
         <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
         <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
         <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
+        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like  &apos;%&apos;||${@bp_name_n}||&apos;%&apos; "/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106N/csh_transaction_maintain_query.lwm

@@ -181,7 +181,7 @@
         <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
         <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
         <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
+        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like &apos;%&apos;||${@bp_name_n}||&apos;%&apos; "/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT110/csh_transaction_maintain_query.lwm

@@ -158,7 +158,7 @@
         <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
         <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
         <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
+        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like &apos;%&apos;||${@bp_name_n}||&apos;%&apos; "/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/zjwfl/WFL2110/zj_wfl_workflow_deliver_query.lwm

@@ -48,6 +48,7 @@
         <bm:ref-field name="employee_name" prompt="WFL_WORKFLOW_DELIVER.DELIVER_TO" relationname="e" sourcefield="name"/>
     </bm:ref-fields>
     <bm:data-filters>
-        <bm:data-filter name="query" expression="(exists (select 1 from sys_user su where su.user_id= ${/session/@user_id} and (su.user_name  in('HAND','HL_ADMIN') or   (su.user_name not in('HAND','HL_ADMIN') and su.user_id=t.recipient_id) )))"/>
+<!--        <bm:data-filter name="query" expression="(exists (select 1 from sys_user su where su.user_id= ${/session/@user_id} and (su.user_name  in('HAND','HL_ADMIN') or   (su.user_name not in('HAND','HL_ADMIN') and su.user_id=t.recipient_id) )))"/>-->
+        <bm:data-filter name="query" expression="(exists (select 1 from sys_role sr where sr.role_id= ${/session/@role_id} and (sr.role_code  in('0017','HAND') or   (sr.role_code not  in('0017','HAND') and ${/session/@user_id}=t.recipient_id) )))"/>
     </bm:data-filters>
 </bm:model>

src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview

@@ -83,6 +83,7 @@
             }
         };
 
+        var clc_flag = 'N';
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
             debugger;
             var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract_change_req');
@@ -150,6 +151,7 @@
                             residual_value: record.get('ccr_residual_value')  //update by xsh35973 20220613
                         },
                         success: function (res) {
+                            clc_flag = 'Y';
                             //record.set('et_fee', res.result.et_fee);
                             var deposit_deduct =record.get('deposit_deduct')||0;
                             record.set('et_total_amount', minus(res.result.et_total_amount,deposit_deduct));
@@ -163,6 +165,7 @@
                             record.set('fund_possession_rate', res.result.fund_possession_rate);
                             record.set('last_rent_due_date', res.result.last_rent_due_date);
                             record.set('sum_unreceived_principal', res.result.sum_unreceived_principal);
+                            clc_flag = 'N';
                         },
                         failure: function () {
                             record.set('termination_date', '');
@@ -194,7 +197,7 @@
                     });
                 }
                 //add by xsh35973 添加修改调整后资源占用费提前结清租金跟随变动
-                if(name == 'fund_possession_cost'){
+                if(name == 'fund_possession_cost' && clc_flag =='N'){
                     if (value < 0 || value == NaN || value == undefined) {
                         Leaf.showMessage('${l:HLS.PROMPT}', '调整后的资金占用费金额应大于等于0！');
                         setTimeout(function () {
@@ -208,7 +211,7 @@
                         record.set('et_due_amount', et_due_amount_result);
                     }
                 }
-                if(name == 'residual_value'){
+                if(name == 'residual_value' && clc_flag =='N'){
                     if (value < 0 || value == NaN || value == undefined) {
                         Leaf.showMessage('${l:HLS.PROMPT}', '调整后的留购金金额应大于等于0！');
                         setTimeout(function () {
@@ -219,7 +222,7 @@
                     var et_total_amount_result=plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), record.get('ccr_penalty'));
                     record.set('et_total_amount',et_total_amount_result);
                 }
-                if(name == 'et_due_amount'){
+                if(name == 'et_due_amount' && clc_flag =='N'){
                     if (value < 0 || value == NaN || value == undefined) {
                         Leaf.showMessage('${l:HLS.PROMPT}', '调整后的提前结清租金金额应大于等于0！');
                         setTimeout(function () {

src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview

@@ -128,7 +128,7 @@
 
         function onUpdate_csh511_receipt(ds, record, name, value, oldvalue) {
             if (name == 'bp_id') {
-                if (value != oldvalue && '${/parameter/@import_source}' != 'HSBC_ADD') {
+                if (value != oldvalue && '${/parameter/@import_source}' != 'HSBC_ADD'&&'${/parameter/@import_source}' != 'EXCEL_ADD') {
                     record.set('bp_bank_account_id', '');
                     record.set('bp_bank_account_code', '');
                     record.set('bp_bank_account_name', '');
@@ -843,7 +843,7 @@
         Leaf.onReady(init);
 
         function init() {
-            if('${/parameter/@import_source}' == 'HSBC_ADD'){
+            if('${/parameter/@import_source}' == 'HSBC_ADD'||'${/parameter/@import_source}' == 'EXCEL_ADD' ){
                 var record = $('csh_transaction_receipt_head_ds').getAt(0);
                 record.getField('transaction_date').setReadOnly(true);
                 record.getField('transaction_amount').setReadOnly(true);