From d60155d02f08c86d7fc99bf0125884923c4e292b Mon Sep 17 00:00:00 2001 From: Xy Date: Fri, 23 Apr 2021 10:09:30 +0000 Subject: [PATCH] --- Api/Dilon.Core/Entity/SysEmpExtOrgPos.cs | 10 +++++----- Api/Dilon.Core/SeedData/SysEmpPosSeedData.cs | 8 ++++---- Api/Dilon.Core/SeedData/SysEmpSeedData.cs | 6 +++--- Api/Dilon.Core/SeedData/SysOrgSeedData.cs | 16 ++++++++-------- Api/Dilon.Core/SeedData/SysPosSeedData.cs | 8 ++++---- Api/Dilon.Core/Service/User/ISysUserService.cs | 2 +- Api/Dilon.Core/Service/User/SysUserService.cs | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Api/Dilon.Core/Entity/SysEmpExtOrgPos.cs b/Api/Dilon.Core/Entity/SysEmpExtOrgPos.cs index ed1ec7c..2b8ee21 100644 --- a/Api/Dilon.Core/Entity/SysEmpExtOrgPos.cs +++ b/Api/Dilon.Core/Entity/SysEmpExtOrgPos.cs @@ -59,11 +59,11 @@ namespace Dilon.Core { return new[] { - new SysEmpExtOrgPos { SysEmpId = "d0ead3dc-5096-4e15-bc6d-f640be5301ec", SysOrgId = "12d888de-f55d-4c88-b0a0-7c3510664d97", SysPosId = "A88D1488-C873-4C7D-A73D-966418151343" }, - new SysEmpExtOrgPos { SysEmpId = "d0ead3dc-5096-4e15-bc6d-f640be5301ec", SysOrgId = "8a2271d6-5bda-4544-bdd3-27e53a8b418e", SysPosId = "3440E091-E1FE-413C-A2C9-BEFB81A30D88" }, - new SysEmpExtOrgPos { SysEmpId = "d0ead3dc-5096-4e15-bc6d-f640be5301ec", SysOrgId = "127c0a5d-43ac-4370-b313-082361885aca", SysPosId = "E27B073B-6AB8-411B-AD6D-35275D084A64" }, - new SysEmpExtOrgPos { SysEmpId = "d0ead3dc-5096-4e15-bc6d-f640be5301ec", SysOrgId = "2FF6DE19-8D61-4100-A391-25C75BF6FA6C", SysPosId = "2261B0D0-5EA9-49CC-B21E-50B72935BD23" }, - new SysEmpExtOrgPos { SysEmpId = "16a74726-e156-499f-9942-0e0e24ad0c3f", SysOrgId = "2FF6DE19-8D61-4100-A391-25C75BF6FA6C", SysPosId = "A88D1488-C873-4C7D-A73D-966418151343" } + new SysEmpExtOrgPos { SysEmpId = "d0ead3dc-5096-4e15-bc6d-f640be5301ec", SysOrgId = "12d888de-f55d-4c88-b0a0-7c3510664d97", SysPosId = "269236c4-d74e-4e54-9d50-f6f61580a197" }, + new SysEmpExtOrgPos { SysEmpId = "d0ead3dc-5096-4e15-bc6d-f640be5301ec", SysOrgId = "8a2271d6-5bda-4544-bdd3-27e53a8b418e", SysPosId = "46c68a62-f119-4ff7-b621-0bbd77504538" }, + new SysEmpExtOrgPos { SysEmpId = "d0ead3dc-5096-4e15-bc6d-f640be5301ec", SysOrgId = "127c0a5d-43ac-4370-b313-082361885aca", SysPosId = "5bd8c466-2bca-4386-a551-daac78e3cee8" }, + new SysEmpExtOrgPos { SysEmpId = "d0ead3dc-5096-4e15-bc6d-f640be5301ec", SysOrgId = "f236ab2d-e1b5-4e9d-844f-a59ec32c20e4", SysPosId = "d89a3afe-e6ba-4018-bdae-3c98bb47ad66" }, + new SysEmpExtOrgPos { SysEmpId = "16a74726-e156-499f-9942-0e0e24ad0c3f", SysOrgId = "f236ab2d-e1b5-4e9d-844f-a59ec32c20e4", SysPosId = "269236c4-d74e-4e54-9d50-f6f61580a197" } }; } } diff --git a/Api/Dilon.Core/SeedData/SysEmpPosSeedData.cs b/Api/Dilon.Core/SeedData/SysEmpPosSeedData.cs index 98b5240..88f0cd5 100644 --- a/Api/Dilon.Core/SeedData/SysEmpPosSeedData.cs +++ b/Api/Dilon.Core/SeedData/SysEmpPosSeedData.cs @@ -20,10 +20,10 @@ namespace Dilon.Core { return new[] { - new SysEmpPos{SysEmpId=142307070910551, SysPosId=142307070910547 }, - new SysEmpPos{SysEmpId=142307070910551, SysPosId=142307070910548 }, - new SysEmpPos{SysEmpId=142307070910552, SysPosId=142307070910549 }, - new SysEmpPos{SysEmpId=142307070910553, SysPosId=142307070910547 } + new SysEmpPos{SysEmpId="d0ead3dc-5096-4e15-bc6d-f640be5301ec", SysPosId="269236c4-d74e-4e54-9d50-f6f61580a197" }, + new SysEmpPos{SysEmpId="d0ead3dc-5096-4e15-bc6d-f640be5301ec", SysPosId="46c68a62-f119-4ff7-b621-0bbd77504538" }, + new SysEmpPos{SysEmpId="5398fb9a-2209-4ce7-a2c1-b6a983e502b5", SysPosId="5bd8c466-2bca-4386-a551-daac78e3cee8" }, + new SysEmpPos{SysEmpId="16a74726-e156-499f-9942-0e0e24ad0c3f", SysPosId="269236c4-d74e-4e54-9d50-f6f61580a197" } }; } } diff --git a/Api/Dilon.Core/SeedData/SysEmpSeedData.cs b/Api/Dilon.Core/SeedData/SysEmpSeedData.cs index 7f1bc52..1e2fc0a 100644 --- a/Api/Dilon.Core/SeedData/SysEmpSeedData.cs +++ b/Api/Dilon.Core/SeedData/SysEmpSeedData.cs @@ -20,9 +20,9 @@ namespace Dilon.Core { return new[] { - new SysEmp{Id=142307070910551, JobNum="D1001", OrgId=142307070910539, OrgName="华夏集团" }, - new SysEmp{Id=142307070910552, JobNum="D1002", OrgId=142307070910539, OrgName="华夏集团" }, - new SysEmp{Id=142307070910553, JobNum="D1003", OrgId=142307070910539, OrgName="华夏集团" } + new SysEmp{Id="d0ead3dc-5096-4e15-bc6d-f640be5301ec", JobNum="D1001", OrgId="12d888de-f55d-4c88-b0a0-7c3510664d97", OrgName="华夏集团" },//142307070910551 + new SysEmp{Id="5398fb9a-2209-4ce7-a2c1-b6a983e502b5", JobNum="D1002", OrgId="12d888de-f55d-4c88-b0a0-7c3510664d97", OrgName="华夏集团" },//142307070910552 + new SysEmp{Id="16a74726-e156-499f-9942-0e0e24ad0c3f", JobNum="D1003", OrgId="12d888de-f55d-4c88-b0a0-7c3510664d97", OrgName="华夏集团" }//142307070910553 }; } } diff --git a/Api/Dilon.Core/SeedData/SysOrgSeedData.cs b/Api/Dilon.Core/SeedData/SysOrgSeedData.cs index 16ab9f7..5ec44c4 100644 --- a/Api/Dilon.Core/SeedData/SysOrgSeedData.cs +++ b/Api/Dilon.Core/SeedData/SysOrgSeedData.cs @@ -20,14 +20,14 @@ namespace Dilon.Core { return new[] { - new SysOrg{Id=142307070910539, Pid=0, Pids="[0],", Name="华夏集团", Code="hxjt", Sort=100, Remark="华夏集团", Status=0 }, - new SysOrg{Id=142307070910540, Pid=142307070910539, Pids="[0],[142307070910539],", Name="华夏集团北京分公司", Code="hxjt_bj", Sort=100, Remark="华夏集团北京分公司", Status=0 }, - new SysOrg{Id=142307070910541, Pid=142307070910539, Pids="[0],[142307070910539],", Name="华夏集团成都分公司", Code="hxjt_cd", Sort=100, Remark="华夏集团成都分公司", Status=0 }, - new SysOrg{Id=142307070910542, Pid=142307070910540, Pids="[0],[142307070910539],[142307070910540],", Name="研发部", Code="hxjt_bj_yfb", Sort=100, Remark="华夏集团北京分公司研发部", Status=0 }, - new SysOrg{Id=142307070910543, Pid=142307070910540, Pids="[0],[142307070910539],[142307070910540],", Name="企划部", Code="hxjt_bj_qhb", Sort=100, Remark="华夏集团北京分公司企划部", Status=0 }, - new SysOrg{Id=142307070910544, Pid=142307070910541, Pids="[0],[142307070910539],[142307070910541],", Name="市场部", Code="hxjt_cd_scb", Sort=100, Remark="华夏集团成都分公司市场部", Status=0 }, - new SysOrg{Id=142307070910545, Pid=142307070910541, Pids="[0],[142307070910539],[142307070910541],", Name="财务部", Code="hxjt_cd_cwb", Sort=100, Remark="华夏集团成都分公司财务部", Status=0 }, - new SysOrg{Id=142307070910546, Pid=142307070910544, Pids="[0],[142307070910539],[142307070910541],[142307070910544],", Name="市场部二部", Code="hxjt_cd_scb_2b", Sort=100, Remark="华夏集团成都分公司市场部二部", Status=0 } + new SysOrg{Id="12d888de-f55d-4c88-b0a0-7c3510664d97", Pid="00000000-0000-0000-0000-000000000000", Pids="[00000000-0000-0000-0000-000000000000],", Name="华夏集团", Code="hxjt", Sort=100, Remark="华夏集团", Status=0 },//142307070910539 + new SysOrg{Id="8a2271d6-5bda-4544-bdd3-27e53a8b418e", Pid="12d888de-f55d-4c88-b0a0-7c3510664d97", Pids="[00000000-0000-0000-0000-000000000000],[12d888de-f55d-4c88-b0a0-7c3510664d97],", Name="华夏集团北京分公司", Code="hxjt_bj", Sort=100, Remark="华夏集团北京分公司", Status=0 },//142307070910540 + new SysOrg{Id="127c0a5d-43ac-4370-b313-082361885aca", Pid="12d888de-f55d-4c88-b0a0-7c3510664d97", Pids="[00000000-0000-0000-0000-000000000000],[12d888de-f55d-4c88-b0a0-7c3510664d97],", Name="华夏集团成都分公司", Code="hxjt_cd", Sort=100, Remark="华夏集团成都分公司", Status=0 },//142307070910541 + new SysOrg{Id="f236ab2d-e1b5-4e9d-844f-a59ec32c20e4", Pid="8a2271d6-5bda-4544-bdd3-27e53a8b418e", Pids="[00000000-0000-0000-0000-000000000000],[12d888de-f55d-4c88-b0a0-7c3510664d97],[8a2271d6-5bda-4544-bdd3-27e53a8b418e],", Name="研发部", Code="hxjt_bj_yfb", Sort=100, Remark="华夏集团北京分公司研发部", Status=0 },//142307070910542 + new SysOrg{Id="07322be0-2015-41f2-859e-132b5e142fca", Pid="8a2271d6-5bda-4544-bdd3-27e53a8b418e", Pids="[00000000-0000-0000-0000-000000000000],[12d888de-f55d-4c88-b0a0-7c3510664d97],[8a2271d6-5bda-4544-bdd3-27e53a8b418e],", Name="企划部", Code="hxjt_bj_qhb", Sort=100, Remark="华夏集团北京分公司企划部", Status=0 },//142307070910543 + new SysOrg{Id="49dc3f25-873d-4998-9767-46978d79d8e6", Pid="127c0a5d-43ac-4370-b313-082361885aca", Pids="[00000000-0000-0000-0000-000000000000],[12d888de-f55d-4c88-b0a0-7c3510664d97],[127c0a5d-43ac-4370-b313-082361885aca],", Name="市场部", Code="hxjt_cd_scb", Sort=100, Remark="华夏集团成都分公司市场部", Status=0 },//142307070910544 + new SysOrg{Id="56b7a823-cc62-492b-a91b-0b053ef2683b", Pid="127c0a5d-43ac-4370-b313-082361885aca", Pids="[00000000-0000-0000-0000-000000000000],[12d888de-f55d-4c88-b0a0-7c3510664d97],[127c0a5d-43ac-4370-b313-082361885aca],", Name="财务部", Code="hxjt_cd_cwb", Sort=100, Remark="华夏集团成都分公司财务部", Status=0 },//142307070910545 + new SysOrg{Id="e9f97d63-a585-40ff-bf0c-7406e785f660", Pid="49dc3f25-873d-4998-9767-46978d79d8e6", Pids="[00000000-0000-0000-0000-000000000000],[12d888de-f55d-4c88-b0a0-7c3510664d97],[127c0a5d-43ac-4370-b313-082361885aca],[49dc3f25-873d-4998-9767-46978d79d8e6],", Name="市场部二部", Code="hxjt_cd_scb_2b", Sort=100, Remark="华夏集团成都分公司市场部二部", Status=0 }//142307070910546 }; } } diff --git a/Api/Dilon.Core/SeedData/SysPosSeedData.cs b/Api/Dilon.Core/SeedData/SysPosSeedData.cs index 1d00272..e487f55 100644 --- a/Api/Dilon.Core/SeedData/SysPosSeedData.cs +++ b/Api/Dilon.Core/SeedData/SysPosSeedData.cs @@ -20,10 +20,10 @@ namespace Dilon.Core { return new[] { - new SysPos{Id=142307070910547, Name="总经理", Code="zjl", Sort=100, Remark="总经理", Status=0 }, - new SysPos{Id=142307070910548, Name="副总经理", Code="fzjl", Sort=101, Remark="副总经理", Status=0 }, - new SysPos{Id=142307070910549, Name="部门经理", Code="bmjl", Sort=102, Remark="部门经理", Status=0 }, - new SysPos{Id=142307070910550, Name="工作人员", Code="gzry", Sort=103, Remark="工作人员", Status=0 } + new SysPos{Id="269236c4-d74e-4e54-9d50-f6f61580a197", Name="总经理", Code="zjl", Sort=100, Remark="总经理", Status=0 },//142307070910547 + new SysPos{Id="46c68a62-f119-4ff7-b621-0bbd77504538", Name="副总经理", Code="fzjl", Sort=101, Remark="副总经理", Status=0 },//142307070910548 + new SysPos{Id="5bd8c466-2bca-4386-a551-daac78e3cee8", Name="部门经理", Code="bmjl", Sort=102, Remark="部门经理", Status=0 },//142307070910549 + new SysPos{Id="d89a3afe-e6ba-4018-bdae-3c98bb47ad66", Name="工作人员", Code="gzry", Sort=103, Remark="工作人员", Status=0 }//142307070910550 }; } } diff --git a/Api/Dilon.Core/Service/User/ISysUserService.cs b/Api/Dilon.Core/Service/User/ISysUserService.cs index 513349f..65c01e6 100644 --- a/Api/Dilon.Core/Service/User/ISysUserService.cs +++ b/Api/Dilon.Core/Service/User/ISysUserService.cs @@ -11,7 +11,7 @@ namespace Dilon.Core.Service Task DeleteUser(DeleteUserInput input); Task ExportUser([FromQuery] UserInput input); Task GetUser([FromQuery] QueryUserInput input); - Task GetUserById(long userId); + Task GetUserById(string userId); Task> GetUserDataScopeIdList(); Task> GetUserDataScopeIdList(long userId); Task GetUserOwnData([FromQuery] QueryUserInput input); diff --git a/Api/Dilon.Core/Service/User/SysUserService.cs b/Api/Dilon.Core/Service/User/SysUserService.cs index 3c5f95a..bd5030c 100644 --- a/Api/Dilon.Core/Service/User/SysUserService.cs +++ b/Api/Dilon.Core/Service/User/SysUserService.cs @@ -334,7 +334,7 @@ namespace Dilon.Core.Service /// /// [NonAction] - public async Task GetUserById(long userId) + public async Task GetUserById(string userId) { return await _sysUserRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == userId); }