业务员、任务

src/Shentun.Peis.Application.Contracts/MyUser/GetUserListBySaleRoleInputDto.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.MyUser
+{
+    public class GetUserListBySaleRoleInputDto
+    {
+        /// <summary>
+        /// 角色对应的系统参数Id
+        /// </summary>
+        public string RoleSysParmId { get; set; } = "sale_role_id";
+    }
+}

src/Shentun.Peis.Application/MyUser/MyUserAppService.cs

@@ -15,6 +15,7 @@ using Shentun.Peis.OrganizationUnits;
 using Shentun.Peis.Permissions;
 using Shentun.Peis.RegisterCheckPictures;
 using Shentun.Peis.Sexs;
+using Shentun.Peis.SysParmValues;
 using Shentun.Utilities;
 using SqlSugar;
 using System;
@@ -55,6 +56,7 @@ namespace Shentun.Peis.MyUser
         private readonly IRepository<IdentityUser, Guid> _identityUserRepository;
         private readonly IdentityUserManager _userManager;
         private readonly IIdentityUserRepository _userRepository;
+        private readonly IRepository<IdentityUserRole> _identityUserRoleRepository;
         private readonly IOptions<IdentityOptions> _identityOptions;
         private readonly IPasswordHasher<IdentityUser> _passwordHasher;
         private readonly IStringEncryptionService _stringEncryptionService;
@@ -66,6 +68,8 @@ namespace Shentun.Peis.MyUser
         private readonly CurrentUser _currentUser;
         private readonly IDistributedCache<IdentityUser, Guid> _userCache;
         private readonly IIdentityRoleRepository _roleRepository;
+        private readonly SysParmValueManager _sysParmValueManager;
+       
 
         public MyUserAppService(
             IRepository<IdentityUser, Guid> identityUserRepository,
@@ -81,7 +85,9 @@ namespace Shentun.Peis.MyUser
             IConfiguration configuration,
             IRepository<IdentityUserOrganizationUnit> identityUserOrganizationUnitRepository,
             CurrentUser currentUser,
-            IDistributedCache<IdentityUser, Guid> userCache)
+            IDistributedCache<IdentityUser, Guid> userCache,
+            SysParmValueManager sysParmValueManager,
+            IRepository<IdentityUserRole> identityUserRoleRepository)
         {
             this._identityUserRepository = identityUserRepository;
             this._userManager = userManager;
@@ -97,6 +103,8 @@ namespace Shentun.Peis.MyUser
             this._currentUser = currentUser;
             _roleRepository = roleRepository;
             _userCache = userCache;
+            _sysParmValueManager = sysParmValueManager;
+            _identityUserRoleRepository = identityUserRoleRepository;
         }
 
 
@@ -348,6 +356,39 @@ namespace Shentun.Peis.MyUser
         }
 
 
+        /// <summary>
+        /// 根据业务员角色获取用户列表   业务员角色id配置系统参数，可以多个
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("api/identity/users/GetUserListBySaleRole")]
+        public async Task<List<ListByOperatorTypeDto>> GetUserListBySaleRoleAsync(GetUserListBySaleRoleInputDto input)
+        {
+            var roleSysParmId = await _sysParmValueManager.GetSysParmValueAsync(Guid.Empty, input.RoleSysParmId);
+            if (string.IsNullOrWhiteSpace(roleSysParmId))
+            {
+                throw new UserFriendlyException("系统参数中未找到角色Id");
+            }
+            List<string> roleIds = roleSysParmId.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList();
+
+            var identityUserList = (from identityUser in await _identityUserRepository.GetQueryableAsync()
+                       join identityUserRole in await _identityUserRoleRepository.GetQueryableAsync() on identityUser.Id equals identityUserRole.UserId
+                       where roleIds.Contains(identityUserRole.RoleId.ToString())
+                       select identityUser).ToList().Distinct().ToList();
+
+        
+            var entlistDto = identityUserList.Select(s => new ListByOperatorTypeDto
+            {
+                Id = s.Id,
+                SimpleCode = LanguageConverter.GetPYSimpleCode(s.Surname),
+                Surname = s.Surname,
+                UserName = s.UserName
+            }).ToList();
+
+            return entlistDto;
+        }
+
+
 
         /// <summary>
         /// 修改

src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs

@@ -112,7 +112,7 @@ public class PeisDbContext :
 
     //public DbSet<IdentityUserClaim>  identityUserClaims { get; set; }
 
-    //public DbSet<IdentityUserRole>  identityUserRoles  { get; set; }
+    public DbSet<IdentityUserRole>  identityUserRoles  { get; set; }
 
     //public DbSet<IdentityUserLogin>  identityUserLogins { get; set; }
 

src/Shentun.Peis.HttpApi.Host/Schedulers/SyncPatientRegisterReportInterfaceWorker.cs

@@ -34,7 +34,6 @@ namespace Shentun.Peis.Schedulers
     }
 
 
-
     public class SyncPatientRegisterReportInterfaceWorker : ThirdInterfaceWorkerBase, ISyncPatientRegisterReportInterfaceWorker
     {
         private static long i;

src/Shentun.Peis.HttpApi.Host/appsettings.json

@@ -5,10 +5,10 @@
     "CorsOrigins": "https://*.Peis.com,http://localhost:4200,http://localhost:9530,http://192.168.1.108:9530,http://localhost:8080,http://localhost:8081,http://192.168.0.3:9531",
     "RedirectAllowedUrls": "http://localhost:9530",
     "SelfUser": "admin",
-    "SelfPassword": "Shentun!@#qwe123",
+    "SelfPassword": "St123",
     //"SelfPassword": "654321",
     "LisUser": "admin",
-    "LisPassword": "Shentun!@#qwe123"
+    "LisPassword": "St123"
     //"LisPassword": "654321"
   },
   "ConnectionStrings": {