From 17184458bb1d2e11c93507336e1c401187ebdd87 Mon Sep 17 00:00:00 2001
From: "yan.y" <yiyan@021.com>
Date: Fri, 20 Sep 2024 11:36:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8B=89=E9=BB=91=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ifish/serviceImpl/FactoryServiceImpl.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/ifish/serviceImpl/FactoryServiceImpl.java b/src/main/java/com/ifish/serviceImpl/FactoryServiceImpl.java
index 042aee3..a67e902 100644
--- a/src/main/java/com/ifish/serviceImpl/FactoryServiceImpl.java
+++ b/src/main/java/com/ifish/serviceImpl/FactoryServiceImpl.java
@@ -67,8 +67,7 @@ public class FactoryServiceImpl implements FactoryService {
 	public int getDeviceCountByFactory(String factoryCode, String billMonth) {
 		String year = billMonth.split("-")[0];
 		String month = billMonth.split("-")[1];
-		int count = this.deviceDao.getNumber("SELECT count(1) from tbl_device td where td.is_charge = '0' and td.factory_code = '"+ factoryCode +"' and str_to_date(td.authorize_time,'%Y-%m')='" + year + "-" + month + "-00'");
-		return count;
+		return this.deviceDao.getNumber("SELECT count(1) from tbl_device td where td.is_charge = '0' and is_blacklist = 0 and td.factory_code = '"+ factoryCode +"' and str_to_date(td.authorize_time,'%Y-%m')='" + year + "-" + month + "-00'");
 	}
 
 	@Override