合并代码

src/app/components/incidentManagement/incident-handle/incident-handle.component.html

@@ -13,9 +13,9 @@
           <app-incident-handle-info [incidentData]="incidentData" (changeCategoryHs)="changeCategoryHs($event)" *ngIf="itsmSimpleHandle.value == 0"></app-incident-handle-info>
           <app-incident-handle-info-simple [incidentData]="incidentData" *ngIf="itsmSimpleHandle.value == 1"></app-incident-handle-info-simple>
         </div>
-        <ng-container [hidden]="activeTabValue !== 2">
+        <div [hidden]="activeTabValue !== 2">
           <app-incident-handle-order [id]="id"></app-incident-handle-order>
-        </ng-container>
+        </div>
       </overlay-scrollbars>
       <overlay-scrollbars #osComponentRef3 class="knowage">
         <div [hidden]="knowageLoading" class="knowageItem" *ngFor="let item of knowageList">

src/app/services/tool.service.ts

@@ -51,10 +51,6 @@ export class ToolService {
       ? JSON.parse(localStorage.getItem("user")).user.currentHospital
       : JSON.parse(localStorage.getItem("user")).infoPermission.hospitals[0];
   }
-	//获取当前用户id
-	getCurrentUserId() {
-	  return JSON.parse(localStorage.getItem("user")).user.id;
-	}
 	//获取当前用户信息
 	getCurrentUserInfo() {
 	  return JSON.parse(localStorage.getItem("user")).user;