Merge branch 'feature/提前结清创建' into develop

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

@@ -135,12 +135,14 @@
                             hlc.enabled_flag  = 'Y'
                             ) lease_channel_n,
                             t.division,
-                            -- add by lihh  20210323 租赁物
-                            (SELECT  v.code_value_name
-                            FROM sys_code_values_v v
-                            where v.code = 'DIVISION'
-                            and v.code_value = t.division)
-                             division_n
+                            (SELECT
+                            t2.description
+                            FROM
+                            hls_division t2
+                            WHERE
+                            t2.enabled_flag = 'Y' AND
+                            t2.division     = t.division
+                            ) division_n
                             FROM
                             con_contract t,
                             hls_bp_master b,

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

@@ -7,7 +7,7 @@
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
     <a:init-procedure>
-        <a:model-query fetchAll="true" model="basic.sys_code_value_v_lease" rootPath="hls_division_path"/>
+        <a:model-query fetchAll="true" model="basic.hls_division_for_lov" rootPath="hls_division_path"/>
     </a:init-procedure>
     <a:view>
         <a:link id="con_et_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
@@ -151,8 +151,8 @@
                         </a:mapping>
                     </a:field>
                     <!--产品线-->
-                    <a:field name="division_n" displayField="value_name" options="hls_division_ds"
-                             returnField="division" valueField="value_code"/>
+                    <a:field name="division_n" displayField="description" options="hls_division_ds"
+                             returnField="division" valueField="division"/>
                     <a:field name="overdue_status"/>
                     <a:field name="overdue_status_desc" displayField="code_value_name" options="yes_or_no_ds"
                              returnField="overdue_status" valueField="code_value"/>