From f604f87781d7cdae5571465a3bafffff53313028 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 08:34:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemBulletinServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemBulletinServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemBulletinServiceImpl.java
index ea2a90d..d7f6b71 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemBulletinServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemBulletinServiceImpl.java
@@ -38,7 +38,9 @@
// 判断发送状态
if(2 == tSystemBulletin.getState()){
// 查找所有司机
- List<TDriver> list = tDriverMapper.selectList(new EntityWrapper<TDriver>());
+ List<TDriver> list = tDriverMapper.selectList(new EntityWrapper<TDriver>()
+ .eq("approvalStatus",2)
+ .eq("status",1));
List<TSystemBulletinUser> tSystemBulletinUsers = new ArrayList<>(list.size());
for (TDriver tDriver : list) {
TSystemBulletinUser tSystemBulletinUser = new TSystemBulletinUser();
--
Gitblit v1.7.1