xignzi006 发布系统代码

app_CRM/src/widgets/account/gradation-treegridex/gradation-treegridex-service.ts

@@ -433,6 +433,7 @@ export default class GradationService extends ControlService {
             if(context && context.srfparentkey){
                 Object.assign(searchFilter,{srfparentkey:JSON.parse(JSON.stringify(context)).srfparentkey});
             }
+            Object.assign(searchFilter,{sort: 'accountname,asc'})
             const _appEntityService: any = this.appEntityService;
             let list: any[] = [];
             if (_appEntityService['FetchRoot'] && _appEntityService['FetchRoot'] instanceof Function) {
@@ -505,6 +506,10 @@ export default class GradationService 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_CHILDACCOUNT)) {
+                Object.assign(searchFilter, { n_parentaccountid_eq: filter.nodeid });
+            }
+
             if (Object.is(filter.strNodeType, this.TREENODE_ROOTACCOUNT)) {
                 Object.assign(searchFilter, { n_parentaccountid_eq: filter.nodeid });
             }
@@ -532,7 +537,7 @@ export default class GradationService extends ControlService {
                         strNodeId += strId;
                         Object.assign(treeNode, { id: strNodeId + '_#_' + filter.srfnodeid });
                         Object.assign(treeNode, { collapsed: true });
-                        Object.assign(treeNode, { leaf: false });
+                        Object.assign(treeNode, { leaf: true });
                         let objLeafFlag = entity.childaccountcount;
                         if (objLeafFlag != null ) {
                             let strLeafFlag: string = objLeafFlag.toString().toLowerCase();
@@ -606,6 +611,7 @@ export default class GradationService extends ControlService {
             if(context && context.srfparentkey){
                 Object.assign(searchFilter,{srfparentkey:JSON.parse(JSON.stringify(context)).srfparentkey});
             }
+            Object.assign(searchFilter,{sort: 'accountname,asc'})
             const _appEntityService: any = this.appEntityService;
             let list: any[] = [];
             if (_appEntityService['FetchDefault'] && _appEntityService['FetchDefault'] instanceof Function) {
@@ -645,7 +651,17 @@ export default class GradationService extends ControlService {
     @Errorlog
     public async fillChildaccountNodeChilds(context:any={}, filter: any, list: any[]): Promise<any> {
 		if (filter.srfnodefilter && !Object.is(filter.srfnodefilter,"")) {
+			// 填充ChildAccount
+            let ChildaccountRsNavContext:any = {};
+            let ChildaccountRsNavParams:any = {};
+            let ChildaccountRsParams:any = {};
+			await this.fillChildaccountNodes(context, filter, list ,ChildaccountRsNavContext,ChildaccountRsNavParams,ChildaccountRsParams);
 		} else {
+			// 填充ChildAccount
+            let ChildaccountRsNavContext:any = {};
+            let ChildaccountRsNavParams:any = {};
+            let ChildaccountRsParams:any = {};
+			await this.fillChildaccountNodes(context, filter, list ,ChildaccountRsNavContext,ChildaccountRsNavParams,ChildaccountRsParams);
 		}
 	}
 

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[ACCOUNT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-account-500-1">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-account-508-1">
         <createTable tableName="ACCOUNT">
                 <column name="ADDRESS1_PRIMARYCONTACTNAME" remarks="" type="VARCHAR(100)">
                 </column>
@@ -10978,31 +10978,31 @@
     </changeSet>
 
         <!--输出实体[ACCOUNT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-500-132">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-508-132">
        <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__ACCOUNT__PARENT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-500-133">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-508-133">
        <addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__CONTACT__PRIMAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-500-134">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-508-134">
        <addForeignKeyConstraint baseColumnNames="PREFERREDEQUIPMENTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__EQUIPMENT__PREF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EQUIPMENTID" referencedTableName="EQUIPMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-500-135">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-508-135">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__LEAD__ORIGINATI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-500-136">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-508-136">
        <addForeignKeyConstraint baseColumnNames="DEFAULTPRICELEVELID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__PRICELEVEL__DEF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-500-137">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-508-137">
        <addForeignKeyConstraint baseColumnNames="PREFERREDSERVICEID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SERVICE__PREFER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-500-138">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-508-138">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-500-139">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-508-139">
        <addForeignKeyConstraint baseColumnNames="TERRITORYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TERRITORY__TERR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TERRITORYID" referencedTableName="TERRITORY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-500-140">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-508-140">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[ACTIVITYMIMEATTACHMENT]外键关系 -->