Merge branch 'feature/租赁物下拉框取值调整' into develop

src/main/webapp/WEB-INF/classes/basic/sys_code_value_v_lease.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+                SELECT v.code_value AS value_code, v.code_value_name AS value_name
+                FROM sys_code_values_v v
+                WHERE v.code_enabled_flag = 'Y'
+                AND v.code_value_enabled_flag = 'Y'
+                AND v.code = 'DIVISION'
+                AND EXISTS
+                (SELECT 1
+                FROM exp_emp_assign_e_v t
+                WHERE t.user_id = ${/session/@user_id}
+                AND unit_code IN ('9998')
+                and PARENT_UNIT_ID = 1544
+                AND v.code_value IN ('50'))
+                UNION ALL
+                SELECT v.code_value AS value_code, v.code_value_name AS value_name
+                FROM sys_code_values_v v
+                WHERE v.code_enabled_flag = 'Y'
+                AND v.code_value_enabled_flag = 'Y'
+                AND v.code = 'DIVISION'
+                AND EXISTS (SELECT 1
+                FROM exp_emp_assign_e_v t
+                WHERE t.user_id = ${/session/@user_id}
+                AND unit_code NOT IN ('9998')
+                and PARENT_UNIT_ID = 1544
+                AND v.code_value IN ('10', '20', '30', '40'))
+                UNION ALL
+                SELECT v.code_value AS value_code, v.code_value_name AS value_name
+                FROM sys_code_values_v v
+                WHERE v.code_enabled_flag = 'Y'
+                AND v.code_value_enabled_flag = 'Y'
+                AND v.code = 'DIVISION'
+                AND EXISTS (SELECT 1
+                FROM exp_emp_assign_e_v t
+                WHERE t.user_id = ${/session/@user_id}
+                and PARENT_UNIT_ID <> 1544
+                AND v.code_value IN ('10', '20', '30', '40','50'))
+                UNION ALL
+                SELECT v.code_value AS value_code, v.code_value_name AS value_name
+                FROM sys_code_values_v v
+                WHERE v.code_enabled_flag = 'Y'
+                AND v.code_value_enabled_flag = 'Y'
+                AND v.code = 'DIVISION'
+                AND v.code_value IN ('10', '20', '30', '40','50')
+                AND NOT EXISTS (SELECT 1
+                FROM exp_emp_assign_e_v t
+                WHERE t.user_id = ${/session/@user_id}
+                )
+                ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:fields>
+        <bm:field name="value_code" />
+        <bm:field name="value_name" />
+    </bm:fields>
+</bm:model>
\ No newline at end of file

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

@@ -60,10 +60,11 @@
                            WHERE a.enabled_flag = 'Y'
                                  AND a.business_type = cc.business_type)                           business_type_n,
                           cc.data_class,
-                          (SELECT hd.description
-                           FROM hls_division hd
-                           WHERE hd.enabled_flag = 'Y'
-                                 AND hd.division = cc.division)                                    division_n,
+                          -- add by lihh  20210317 租赁物
+                          (SELECT  v.code_value_name
+                                FROM sys_code_values_v v
+                                where v.code = 'DIVISION'
+                                and v.code_value = cc.division)                                    division_n,
                           cc.division,
                           contract_item_query_pkg.calc_ac_overdue_times(p_contract_id => cc.contract_id,
                                                                         p_calc_date   => SYSDATE,

src/main/webapp/modules/cont/CON620/con_contract_rent_dun_query.lview

@@ -347,7 +347,8 @@
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
         <a:dataSets>
-            <a:dataSet id="con501_division_name_ds" loadData="true" model="basic.hls_division_for_lov"/>
+<!--            <a:dataSet id="con501_division_name_ds" loadData="true" model="basic.hls_division_for_lov"/>-->
+            <a:dataSet id="con501_division_name_ds" loadData="true" model="basic.sys_code_value_v_lease"/>
             <a:dataSet id="business_type_ds">
                 <a:datas>
                     <a:record code_value="LEASE" code_value_name="直租"/>
@@ -384,8 +385,8 @@
                              valueField="lease_organization"/>
                     <a:field name="business_type_n" displayField="code_value_name" options="business_type_ds"
                              returnField="business_type" valueField="code_value"/>
-                    <a:field name="division_n" displayField="description" options="con501_division_name_ds"
-                             returnField="division" valueField="division"/>
+                    <a:field name="division_n" displayField="value_name" options="con501_division_name_ds"
+                             returnField="division" valueField="value_code"/>
                 </a:fields>
             </a:dataSet>
             <a:dataSet id="CON620_contract_result_ds" autoPageSize="true" autoQuery="true"