Browse Source

pushmessage

Dun.Jason 1 year ago
parent
commit
3b359edfa0

+ 2 - 2
src/Hotline.Api/Controllers/OrderController.cs

@@ -1666,7 +1666,7 @@ public class OrderController : BaseController
                 try
                 {
                     //查询部门所有账号
-                    var userlist = await _userRepository.Queryable().Where(x => x.OrgId == model.OrgId).ToListAsync();
+                    var userlist = await _userRepository.Queryable().Where(x => x.OrgId == model.OrgId && !string.IsNullOrEmpty(x.PhoneNo)).ToListAsync();
                     //发送短信
                     foreach (var user in userlist)
                     {
@@ -1909,7 +1909,7 @@ public class OrderController : BaseController
                 try
                 {
                     //查询部门所有账号
-                    var userlist = await _userRepository.Queryable().Where(x => x.OrgId == model.OrgId).ToListAsync();
+                    var userlist = await _userRepository.Queryable().Where(x => x.OrgId == model.OrgId && !string.IsNullOrEmpty(x.PhoneNo)).ToListAsync();
                     foreach (var user in userlist)
                     {
                         //发送短信

+ 15 - 13
src/Hotline.Application/Handlers/FlowEngine/WorkflowPreviousHandler.cs

@@ -104,21 +104,23 @@ namespace Hotline.Application.Handlers.FlowEngine
                     try
                     {
                         var user = await _userRepository.GetAsync(notification.TargetStep.HandlerId);
-
-                        var messageDto = new MessageDto()
+                        if (!string.IsNullOrEmpty(user.PhoneNo))
                         {
-                            PushBusiness = EPushBusiness.OrderCallback,
-                            ExternalId = order.Id,
-                            OrderId = order.Id,
-                            PushPlatform = EPushPlatform.Sms,
-                            Remark = order.Title,
-                            Name = user.PhoneNo,
-                            TemplateCode = "1004",
-                            Params = new List<string>() { order.No },
-                            TelNumber = user.PhoneNo,
+                            var messageDto = new MessageDto()
+                            {
+                                PushBusiness = EPushBusiness.OrderCallback,
+                                ExternalId = order.Id,
+                                OrderId = order.Id,
+                                PushPlatform = EPushPlatform.Sms,
+                                Remark = order.Title,
+                                Name = user.PhoneNo,
+                                TemplateCode = "1004",
+                                Params = new List<string>() { order.No },
+                                TelNumber = user.PhoneNo,
 
-                        };
-                        await _mediator.Publish(new PushMessageNotify(messageDto), cancellationToken);
+                            };
+                            await _mediator.Publish(new PushMessageNotify(messageDto), cancellationToken);
+                        }
                     }
                     catch { }
                     break;