From ed6ab6cb6e266969067d88c3b3443c49344c7ce6 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sat, 8 Oct 2022 11:41:10 +0800
Subject: [PATCH] Organization type = 'department',sortIndex = 11

---
 .../organization-editer.component.ts                | 13 +++++++------
 .../routes/organizations/organizations.component.ts |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.ts
index 11229d81c..2072c88cf 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.ts
@@ -15,7 +15,7 @@
  */
 import { I18nPluralPipe } from '@angular/common';
 import { LocalizedString } from '@angular/compiler';
-import {Component, ChangeDetectorRef, Input, OnInit, Inject, ViewChild} from '@angular/core';
+import { Component, ChangeDetectorRef, Input, OnInit, Inject, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { I18NService } from '@core';
 import { _HttpClient, ALAIN_I18N_TOKEN, SettingsService } from '@delon/theme';
@@ -24,10 +24,10 @@ import { NzI18nService } from 'ng-zorro-antd/i18n';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
 import { NzFormatEmitEvent, NzTreeNode, NzTreeNodeOptions } from 'ng-zorro-antd/tree';
+import { NzTreeSelectComponent } from 'ng-zorro-antd/tree-select';
 
 import { Organizations } from '../../../entity/Organizations';
 import { OrganizationsService } from '../../../service/organizations.service';
-import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select";
 
 @Component({
   selector: 'app-organization-editer',
@@ -47,7 +47,7 @@ export class OrganizationEditerComponent implements OnInit {
   @Input() parentNode?: NzTreeNode;
   @Input() isEdit?: boolean;
   @Input() orgNodes!: any[];
-  @ViewChild("orgTree") orgTree!: NzTreeSelectComponent;
+  @ViewChild('orgTree') orgTree!: NzTreeSelectComponent;
   form: {
     submitting: boolean;
     model: Organizations;
@@ -74,7 +74,8 @@ export class OrganizationEditerComponent implements OnInit {
         this.cdr.detectChanges();
       });
     } else {
-      this.form.model.type = 'entity';
+      this.form.model.type = 'department';
+      this.form.model.sortIndex = 11;
       if (this.parentNode) {
         this.form.model.parentId = this.parentNode?.key;
         this.form.model.parentName = this.parentNode?.title;
@@ -84,8 +85,8 @@ export class OrganizationEditerComponent implements OnInit {
   }
   onDeptChange(key: string): void {
     let node = this.orgTree.getTreeNodeByKey(key);
-    if (node){
-      this.form.model.parentName = node.title
+    if (node) {
+      this.form.model.parentName = node.title;
     }
   }
   onClose(e: MouseEvent): void {
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.ts
index a437d6aad..636850533 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organizations.component.ts
@@ -171,7 +171,7 @@ export class OrganizationsComponent implements OnInit {
     modal.afterClose.subscribe(result => {
       if (result.refresh) {
         this.fetch();
-        this.tree()
+        this.tree();
       }
     });
   }
@@ -193,7 +193,7 @@ export class OrganizationsComponent implements OnInit {
     modal.afterClose.subscribe(result => {
       if (result.refresh) {
         this.fetch();
-        this.tree()
+        this.tree();
       }
     });
   }
@@ -204,7 +204,7 @@ export class OrganizationsComponent implements OnInit {
       if (res.code == 0) {
         this.msg.success(this.i18n.fanyi('mxk.alert.delete.success'));
         this.fetch();
-        this.tree()
+        this.tree();
       } else {
         this.msg.error(this.i18n.fanyi('mxk.alert.delete.error'));
       }