短信发送

src/Hotline.Api/Controllers/OrderController.cs

@@ -2200,7 +2200,7 @@ public class OrderController : BaseController
                     //查询部门所有账号
                     var userlist = await _userRepository.Queryable().Where(x =>
                         x.OrgId == model.OrgId && !string.IsNullOrEmpty(x.PhoneNo) &&
-                        x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e")).ToListAsync();
+                        x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e" || d.Id == "08dc48c7-b681-4539-860b-f391cf2aa267" || d.Id == "08dc48c7-bcf7-4c6e-8246-346db53d5bd6" || d.Id == "08dc48c8-42b8-4433-8d0f-5e177052d59d")).ToListAsync();
                     //发送短信
                     foreach (var user in userlist)
                     {
@@ -2444,7 +2444,7 @@ public class OrderController : BaseController
                     //查询部门所有账号
                     var userlist = await _userRepository.Queryable().Where(x =>
                         x.OrgId == model.OrgId && !string.IsNullOrEmpty(x.PhoneNo) &&
-                        x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e")).ToListAsync();
+                        x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e" || d.Id == "08dc48c7-b681-4539-860b-f391cf2aa267" || d.Id == "08dc48c7-bcf7-4c6e-8246-346db53d5bd6" || d.Id == "08dc48c8-42b8-4433-8d0f-5e177052d59d")).ToListAsync();
                     foreach (var user in userlist)
                     {
                         //发送短信

src/Hotline.Application/Handlers/FlowEngine/WorkflowNextHandler.cs

@@ -157,7 +157,7 @@ public class WorkflowNextHandler : INotificationHandler<NextStepNotify>
                                 case EFlowAssignType.Org:
                                     var orgCodes = notification.FlowAssignInfo.HandlerObjects.Select(x => x.Key);
                                     var orgList = await _userRepository.Queryable()
-                                        .Where(x => orgCodes.Contains(x.OrgId) && x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e"))
+                                        .Where(x => orgCodes.Contains(x.OrgId) && x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e" || d.Id== "08dc48c7-b681-4539-860b-f391cf2aa267" || d.Id== "08dc48c7-bcf7-4c6e-8246-346db53d5bd6" || d.Id == "08dc48c8-42b8-4433-8d0f-5e177052d59d"))
                                         .ToListAsync(cancellationToken);
                                     foreach (var item in orgList)
                                     {
@@ -183,7 +183,7 @@ public class WorkflowNextHandler : INotificationHandler<NextStepNotify>
                                 case EFlowAssignType.User:
                                     var userCodes = notification.FlowAssignInfo.HandlerObjects.Select(x => x.Key);
                                     var userList = await _userRepository.Queryable()
-                                        .Where(x => userCodes.Contains(x.Id) && x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e"))
+                                        .Where(x => userCodes.Contains(x.Id) && x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e" || d.Id == "08dc48c7-b681-4539-860b-f391cf2aa267" || d.Id == "08dc48c7-bcf7-4c6e-8246-346db53d5bd6" || d.Id == "08dc48c8-42b8-4433-8d0f-5e177052d59d"))
                                         .ToListAsync(cancellationToken);
                                     foreach (var item in userList)
                                     {

src/Hotline.Application/Handlers/FlowEngine/WorkflowStartHandler.cs

@@ -140,7 +140,7 @@ namespace Hotline.Application.Handlers.FlowEngine
                                     case EFlowAssignType.Org:
                                         var orgCodes = notification.FlowAssignInfo.HandlerObjects.Select(x => x.Key);
                                         var orgList = await _userRepository.Queryable().Where(x =>
-                                            orgCodes.Contains(x.OrgId) && x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e")).ToListAsync();
+                                            orgCodes.Contains(x.OrgId) && x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e" || d.Id == "08dc48c7-b681-4539-860b-f391cf2aa267" || d.Id == "08dc48c7-bcf7-4c6e-8246-346db53d5bd6" || d.Id == "08dc48c8-42b8-4433-8d0f-5e177052d59d")).ToListAsync();
                                         foreach (var item in orgList)
                                         {
                                             if (!string.IsNullOrEmpty(item.PhoneNo))
@@ -165,7 +165,7 @@ namespace Hotline.Application.Handlers.FlowEngine
                                     case EFlowAssignType.User:
                                         var userCodes = notification.FlowAssignInfo.HandlerObjects.Select(x => x.Key);
                                         var userList = await _userRepository.Queryable().Where(x =>
-                                            userCodes.Contains(x.Id) && x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e")).ToListAsync();
+                                            userCodes.Contains(x.Id) && x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e" || d.Id == "08dc48c7-b681-4539-860b-f391cf2aa267" || d.Id == "08dc48c7-bcf7-4c6e-8246-346db53d5bd6" || d.Id == "08dc48c8-42b8-4433-8d0f-5e177052d59d")).ToListAsync();
                                         foreach (var item in userList)
                                         {
                                             var messageDto = new Share.Dtos.Push.MessageDto

src/Hotline.Application/Subscribers/InternalCapSubscriber.cs

@@ -73,7 +73,7 @@ namespace Hotline.Application.Subscribers
                     //查询部门经办人
                     var userlist = await _userRepository.Queryable().Where(x =>
                         x.OrgId == order.CurrentHandleOrgId && !string.IsNullOrEmpty(x.PhoneNo) &&
-                        x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e")).ToListAsync();
+                        x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e" || d.Id == "08dc48c7-b681-4539-860b-f391cf2aa267" || d.Id == "08dc48c7-bcf7-4c6e-8246-346db53d5bd6" || d.Id == "08dc48c8-42b8-4433-8d0f-5e177052d59d")).ToListAsync();
                     foreach (var user in userlist)
                     {
                         if (!string.IsNullOrEmpty(user.PhoneNo))
@@ -141,7 +141,7 @@ namespace Hotline.Application.Subscribers
                     //查询部门经办人
                     var userlist = await _userRepository.Queryable().Where(x =>
                         x.OrgId == order.CurrentHandleOrgId && !string.IsNullOrEmpty(x.PhoneNo) &&
-                        x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e")).ToListAsync();
+                        x.Roles.Any(d => d.Id == "08dae71e-0eca-4bc4-89fe-7eaefae8a98e" || d.Id == "08dc48c7-b681-4539-860b-f391cf2aa267" || d.Id == "08dc48c7-bcf7-4c6e-8246-346db53d5bd6" || d.Id == "08dc48c8-42b8-4433-8d0f-5e177052d59d")).ToListAsync();
                     foreach (var user in userlist)
                     {
                         if (!string.IsNullOrEmpty(user.PhoneNo))