多组织

src/app/core/startup/startup.service.ts

@@ -43,7 +43,7 @@ export class StartupService {
 
       zip(
         // this.httpClient.get(`assets/tmp/i18n/${this.i18n.defaultLang}.json`),
-        this.httpClient.get('sys/ng-alain/getAppData?orgId='+sessionStorage.getItem('pkorg'))
+        this.httpClient.get('sys/ng-alain/getAppData?orgId='+sessionStorage.getItem('pkOrg'))
         //this.httpClient.get('./assets/tmp/app-data.json')
       ).pipe(
         // 接收其他拦截器后产生的异常消息
@@ -149,7 +149,7 @@ export class StartupService {
         // });
         // console.error(res.menu)
         this.menuService.add(res.menu);
-        sessionStorage.setItem('pkorg',res.pkOrg)
+        sessionStorage.setItem('pkOrg',res.user.pkOrg)
         // 设置页面标题的后缀
         this.titleService.default = '';
         // this.titleService.suffix = "方达项目管理系统";

src/app/entity/Result.ts

@@ -5,4 +5,5 @@ export class Result<T>{
     searchCount:boolean;
     size:number;
     total:number;
+    pkOrg?:string;//组织id
   }

src/app/entity/baseResponse.ts

@@ -4,4 +4,5 @@ export class BaseResponse<T>{
   code: number;
   result:T;
   timestamp:number;
+  pkOrg?:string;//组织id
 }

src/app/entity/basedata/base-archives-collection-line.ts

@@ -6,4 +6,5 @@ export class BaseArchivesCollectionLine extends Page{
     id?:string;// 收付款条线主键
     code?:string;//收付款条线编码
     name?:string;//收付款条线名称
+    pkOrg?:string;//组织id
 }

src/app/entity/basedata/base-archives-cost.ts

@@ -6,4 +6,5 @@ export class BaseArchivesCost extends Page{
     id?:string;// 费用主键
     code?:string;//费用编码
     name?:string;//费用名称
+    pkOrg?:string;//组织id
 }

src/app/entity/basedata/base-archives-milestone.ts

@@ -9,4 +9,5 @@ export class BaseArchivesMilestone  extends Page{
     name?:string;//里程碑名称
     parentId?:string;//父级id
     type?:string;//类别-数据字典
+    pkOrg?:string;//组织id
 }

src/app/entity/basedata/base-archives-post.ts

@@ -10,4 +10,5 @@ export class BaseArchivesPost extends Page{
     name?:string;//职务名称
     parentId?:string;//父级id
     status?:string;//是否启用
+    pkOrg?:string;//组织id
 }

src/app/entity/basedata/base-archives-project-approval.ts

@@ -10,4 +10,5 @@ export class BaseArchivesProjectApproval  extends Page{
     name?:string;//项目立项名称
     parentId?:string;//父级id
     status?:string;//是否启用
+    pkOrg?:string;//组织id
 }

src/app/entity/basedata/customer-contacts.ts

@@ -15,4 +15,5 @@ export class CustomerContacts extends Page{
     updateTime?:Date;// 修改时间
     memo?:string;// 备注
     isDefaultBool?:boolean;//前端用于处理switch控件
+    pkOrg?:string;//组织id
 }

src/app/entity/basedata/customer.ts

@@ -24,4 +24,5 @@ export class Customer extends Page{
     postalAddress?:string;//注册地址
     isAbbreviation?:string;//是否存在同样客户缩写1不存在2存在
     fdCustomerList?:[];//自身集合
+    pkOrg?:string;//组织id
 }

src/app/entity/depart.ts

@@ -15,4 +15,5 @@ export class Depart {
   pkPersonnel?:string;//人员主键
   type?:string;//类型
   fix?:string;
+  pkOrg?:string;//组织id
 }

src/app/entity/dict-item.ts

@@ -3,4 +3,5 @@ import { Page } from './page';
 export class DictItem extends Page{
   dictId?:string;//字典id
   pfFileJurisdiction?:string;//文件上传下载权限（项目档案中的文件上传下载权限）
+  pkOrg?:string;//组织id
 }

src/app/entity/dict.ts

@@ -6,5 +6,6 @@ export class Dict extends Page{
     dictCode?:string;//字典编码
     description?:string;//描述
     pageNo?:number
+    pkOrg?:string;//组织id
 }
 

src/app/entity/menu.ts

@@ -13,4 +13,5 @@ export class Menu{
   route?:boolean;
   parentName?:string;
   parentId?:string;
+  pkOrg?:string;//组织id
 }

src/app/entity/permission-data-rule.ts

@@ -28,4 +28,5 @@ export class PermissionDataRule extends Page{
 		ruleValue?:string;
 	
 		dataRuleIds?:string;//数据规则ids
+		pkOrg?:string;//组织id
 }

src/app/entity/role-permission.ts

@@ -14,4 +14,5 @@ export class RolePermission {
    * 数据权限
    */
   dataRuleIds?: string
+  pkOrg?:string;//组织id
 }

src/app/entity/role.ts

@@ -2,9 +2,10 @@ import { Page } from './page';
 
 export class Role extends Page{
   id?: string;
-  roleCode: string;
-  roleName: string;
+  roleCode?: string;
+  roleName?: string;
   description?: string;
   pageNo?: number
   delFlag?:string;//删除标记0否1是
+  pkOrg?:string;
 }

src/app/entity/serial-pattern.ts

@@ -16,4 +16,5 @@ export class SerialPattern extends Page{
   createTime?:string;  // 创建时间
   updateBy?:string;    // 更新人
   updateTime?:string;  // 更新时间
+  pkOrg?:string;
 }

src/app/entity/sys-announcement-send.ts

@@ -22,4 +22,5 @@ export class SysAnnouncementSend extends Page{
   msgType?:string;
   sendTime?:string;
   userIds?:string;
+  pkOrg?:string;
 }

src/app/entity/sys-announcement.ts

@@ -42,4 +42,5 @@ export class SysAnnouncement extends Page{
 
     //接收人
     sysAnnouncementSendList?:SysAnnouncementSend[];
+    pkOrg?:string;//组织id
 }

src/app/entity/timed-task.ts

@@ -18,4 +18,5 @@ export class TimedTask extends Page{
   createTime?:string;  // 创建时间
   updateBy?:string;    // 更新人
   updateTime?:string;  // 更新时间
+  pkOrg?:string;//组织id
 }

src/app/entity/user.ts

@@ -21,4 +21,5 @@ export class User extends Page{
   departName?:string;
   roleName?:string;//角色名称
   personnelName?:string;//代理人名称
+  pkOrg?:string;//组织id
 }

src/app/layout/default/header/header.component.ts

@@ -44,7 +44,7 @@ export class HeaderComponent {
         this.orgList = response.result;
         this.orgList.forEach(element => {
           if(element.id==this.settings.user.pkOrg){
-            sessionStorage.setItem('pkorg',element.id)
+            sessionStorage.setItem('pkOrg',element.id)
           }
         });
       }
@@ -57,11 +57,7 @@ export class HeaderComponent {
   departName = '';
   orgClick(org) {
     this.departName = org.departName;
-    sessionStorage.setItem('pkorg', org.id);
-    // window.location.reload();
-    // this.reuseTabService.clear();
-    // this.router.navigateByUrl('/dashboard/analysis');
-    // this.router.navigateByUrl("");
+    sessionStorage.setItem('pkOrg', org.id);
     // this.startupSrv.load().then(() => {
     //   /*
     //   let url = this.tokenService.referrer!.url || '/dashboard/analysis';

src/app/routes/basedata/base-archives-cost/base-archives-cost.component.ts

@@ -48,7 +48,6 @@ export class BasedataBaseArchivesCostComponent implements OnInit {
    * 查询按钮
    */
   query(){
-    console.log(sessionStorage.getItem('pkorg'));
     this.baseArchivesCost.pageNo = 1;
     this.getList();
   }

src/app/routes/passport/login/login.component.ts

@@ -132,7 +132,7 @@ export class UserLoginComponent implements OnDestroy {
         // 设置用户Token信息
         //this.tokenService.set(res.user);
         this.tokenService.set(res.result);
-        sessionStorage.setItem('pkorg', "");
+        sessionStorage.setItem('pkOrg', "");
         //console.log(res);
         // 重新获取 StartupService 内容，我们始终认为应用信息一般都会受当前用户授权范围而影响
         this.startupSrv.load().then(() => {

src/app/routes/system/depart/depart.component.ts

@@ -80,7 +80,9 @@ export class SystemDepartComponent implements OnInit {
 
   //查询树节点数据
   getAllTreeDepart() {
-    this.departService.getAllDepart1().then((response) => {
+    let depart=new Depart();
+    // depart.pkOrg=sessionStorage.getItem("pkOrg");
+    this.departService.getAllDepart1(depart).then((response) => {
       this.nodes = response.result
     })
   }

src/app/routes/system/menu/menu.component.ts

@@ -68,6 +68,7 @@ import { Component, OnInit } from '@angular/core';
 import { MenuService } from 'app/services/menu.service';
 import { SystemMenuDataRolesComponent } from './data-roles/data-roles.component';
 import { EventManager } from '@angular/platform-browser';
+import { Menu } from 'app/entity/menu';
 
 export interface TreeNodeInterface {
   key: string;
@@ -141,7 +142,9 @@ export class SystemMenuComponent implements OnInit {
   //获取用户菜单信息
   getMenus() {
     this.isSpinning = true;
-    this.menuService.getMenus1().then((response) => {
+    let menu=new Menu();
+    menu.pkOrg=sessionStorage.getItem("pkOrg");
+    this.menuService.getMenus1(menu).then((response) => {
       this.listOfMapData = response.result;
       this.listOfMapData.forEach(item => {
         this.mapOfExpandedData[item.key] = this.convertTreeToList(item);

src/app/routes/system/role/edit/edit.component.ts

@@ -44,7 +44,9 @@ export class SystemRoleEditComponent implements OnInit {
   @Output() afterSave = new EventEmitter<{}>();
   //保存
   save() {
+    
     if(this.role.id==null || this.role.id==""){
+      this.role.pkOrg=sessionStorage.getItem("pkOrg")
       this.roleService.add(this.role).then((response) => {
         this.notification.success(this.i18NService.fanyi("insert.success"),"");
         this.afterSave.emit();

src/app/routes/system/role/role.component.ts

@@ -19,7 +19,7 @@ export class SystemRoleComponent implements OnInit {
 
   page: any = {}
 
-  role: Role
+  role: Role={}
 
 
   constructor(
@@ -37,7 +37,8 @@ export class SystemRoleComponent implements OnInit {
       roleCode: "",
       roleName: "",
       description: "",
-      pageNo: 0
+      pageNo: 0,
+      pkOrg:""
     }
   }
 
@@ -55,6 +56,7 @@ export class SystemRoleComponent implements OnInit {
   // 获取用户菜单信息
   getRoles() {
     this.isSpinning = true;
+    this.role.pkOrg=sessionStorage.getItem("pkOrg");
     this.roleService.getRoles1(this.role).then((response) => {
       console.error(response)
       this.page = response.result

src/app/services/depart.service.ts

@@ -22,8 +22,8 @@ export class DepartService {
   }
 
   //查询全部的部门tree(有权限)
-  async getAllDepart1(): Promise<BaseResponse<Result<any>>> {
-    return await this.http.get<BaseResponse<Result<any>>>('sysdepart/sysDepart/queryTreeList1').toPromise();
+  async getAllDepart1(body:any): Promise<BaseResponse<Result<any>>> {
+    return await this.http.get<BaseResponse<Result<any>>>('sysdepart/sysDepart/queryTreeList1',{params:body}).toPromise();
   }
 
   //查询全部部门不是tree集合

src/app/services/menu.service.ts

@@ -15,8 +15,8 @@ export class MenuService {
   }
 
   //获取所有的菜单信息(权限)
-  async getMenus1(): Promise<BaseResponse<any>> {
-    return await this.http.get<BaseResponse<any>>('sys/permission/list1').toPromise();
+  async getMenus1(body:any): Promise<BaseResponse<any>> {
+    return await this.http.get<BaseResponse<any>>('sys/permission/list1',{params:body}).toPromise();
   }
   //新增菜单
   async add(body:Menu): Promise<BaseResponse<any>> {