jackwang 部署微服务应用

app_PIM/src/locale/lanres/entities/hromhierarchy/hromhierarchy_en_US.ts

@@ -187,7 +187,7 @@ export default {
 	},
 	tree_001_treeview: {
 		nodes: {
-			root: "默认根节点",
+			root: "全部组织",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hromhierarchy/hromhierarchy_zh_CN.ts

@@ -186,7 +186,7 @@ export default {
 	},
 	tree_001_treeview: {
 		nodes: {
-			root: "默认根节点",
+			root: "全部组织",
 		},
 		uiactions: {
 		},

app_PIM/src/widgets/hromhierarchy/tree-001-treeview/tree-001-treeview-service.ts

@@ -72,7 +72,7 @@ export default class TREE_001Service extends ControlService {
 	public TREENODE_SECOND: string = 'second';
 
     /**
-     * 默认根节点节点分隔符号
+     * 全部组织节点分隔符号
      *
      * @public
      * @type {string}
@@ -332,7 +332,7 @@ export default class TREE_001Service extends ControlService {
 	}
 
     /**
-     * 填充 树视图节点[默认根节点]
+     * 填充 树视图节点[全部组织]
      *
      * @public
      * @param {any{}} context     
@@ -372,7 +372,7 @@ export default class TREE_001Service extends ControlService {
 	}
 
     /**
-     * 填充 树视图节点[默认根节点]子节点
+     * 填充 树视图节点[全部组织]子节点
      *
      * @public
      * @param {any{}} context         
@@ -417,11 +417,6 @@ export default class TREE_001Service extends ControlService {
         filter = this.handleResNavParams(context,filter,rsNavParams,rsParams);
         return new Promise((resolve:any,reject:any) =>{
             let searchFilter: any = {};
-
-            if (Object.is(filter.strNodeType, this.TREENODE_ROOT)) {
-                Object.assign(searchFilter, { n_n_hromhierarchycatid_eq_eq: filter.nodeid });
-            }
-
             Object.assign(searchFilter, { total: false });
             let bFirst: boolean = true;
             let records: any[] = [];
@@ -447,6 +442,7 @@ export default class TREE_001Service extends ControlService {
                         Object.assign(treeNode, { iconcls: 'fa fa-sitemap' });
                         Object.assign(treeNode, { expanded: true });
                         Object.assign(treeNode, { leaf: false });
+                        Object.assign(treeNode, { navfilter: "n_pomhierarchyid_eq" });
                         Object.assign(treeNode, { curData: entity });
                         Object.assign(treeNode, { nodeid: treeNode.srfkey });
                         Object.assign(treeNode, { nodeid2: filter.strRealNodeId });

app_PIM/src/widgets/hromhierarchy/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.tsx

@@ -197,7 +197,7 @@ export class TreeExpViewtreeexpbarTreeExpBarBase extends MainControlBase {
         if (Object.is(expmode, 'FIRST')) {
             return {  
                 viewname: 'hromhierarchy-grid-view', 
-                parentdata: {},
+                parentdata: {"srfparentdefname":"n_pomhierarchyid_eq"},
                 deKeyField:'hromhierarchy'
 			};
         }

humanresource-core/src/main/resources/liquibase/h2_table.xml

@@ -112,7 +112,7 @@
 
 
     <!--输出实体[HROMHIERARCHY]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchy-55-6">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchy-73-6">
         <createTable tableName="OMHIERARCHY">
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -140,7 +140,7 @@
 
 
     <!--输出实体[HROMHIERARCHYCAT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchycat-41-7">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchycat-53-7">
         <createTable tableName="OMHIERARCHYCAT">
                 <column name="OMHIERARCHYCATID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HROMHIERARCHYCAT_OMHIERARCH"/>
@@ -305,13 +305,13 @@
         <!--输出实体[HRLEGAL]外键关系 -->
         <!--输出实体[HROMHIERARCHYPURPOSE]外键关系 -->
         <!--输出实体[HROMHIERARCHY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-55-14">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-73-14">
        <addForeignKeyConstraint baseColumnNames="HROMHIERARCHYCATID" baseTableName="OMHIERARCHY" constraintName="DER1N_HROMHIERARCHY_HROMHIERAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OMHIERARCHYCATID" referencedTableName="OMHIERARCHYCAT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-55-15">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-73-15">
        <addForeignKeyConstraint baseColumnNames="POMHIERARCHYID" baseTableName="OMHIERARCHY" constraintName="DER1N_OMHIERARCHY_OMHIERARCHY_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OMHIERARCHYID" referencedTableName="OMHIERARCHY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-55-16">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-73-16">
        <addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="OMHIERARCHY" constraintName="DER1N_OMHIERARCHY_ORGANIZATION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
         <!--输出实体[HROMHIERARCHYCAT]外键关系 -->