From bcae4ea89689db7493cb58ccdf25412264cfded2 Mon Sep 17 00:00:00 2001
From: liuchengqian <liuchengqian666@gmail.com>
Date: Fri, 10 Mar 2023 17:16:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E4=BA=8E=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E8=AE=A2=E9=98=85=E5=8C=BA=E5=88=92=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xkrs/helper/FirePointSubscribeManager.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/com/xkrs/helper/FirePointSubscribeManager.java b/src/main/java/com/xkrs/helper/FirePointSubscribeManager.java
index 67f7242..f3144bb 100644
--- a/src/main/java/com/xkrs/helper/FirePointSubscribeManager.java
+++ b/src/main/java/com/xkrs/helper/FirePointSubscribeManager.java
@@ -123,6 +123,15 @@ public class FirePointSubscribeManager {
     private List<String> obtainCountyCodeList(List<SysUserEntity> sysUserEntityList) {
         List<String> countyCodeList = new ArrayList<>();
         for (SysUserEntity sysUserEntity : sysUserEntityList) {
+            if (sysUserEntity.getActiveFlag() != 0) {//被禁用的用户不计入订阅
+                continue;
+            }
+            if (sysUserEntity.getReceiveSms() != 1) {//关掉开关的用户不计入订阅
+                continue;
+            }
+            if ("管理员".equals(sysUserEntity.getAccountType())) {//管理员用户不计入订阅
+                continue;
+            }
             boolean inVipTimeRange = VipTimeRangeUtils.checkIfInVipTimeRange(sysUserEntity.getVipTimeRangeJson());
             if (inVipTimeRange) {
                 countyCodeList.add(sysUserEntity.getCountyCode());