From 7bf2bb09b873e4728870932c492009311397a17c Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 13 Jul 2021 10:47:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BB=93=E6=9D=9F=E5=B7=A1?=
 =?UTF-8?q?=E6=9F=A5=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/StaffPatrolRecordServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
index 03d0b063a5..dcddb5c666 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
@@ -287,8 +287,8 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 	@Override
 	public void endPatrolJob(StartPatrolFormDTO formDTO) {
 		LambdaQueryWrapper<StaffPatrolRecordEntity> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(StaffPatrolRecordEntity :: getCustomerId, formDTO.getCustomerId());
 		wrapper.eq(StaffPatrolRecordEntity :: getStatus, PatrolConstant.PATROLLING);
+		wrapper.eq(StringUtils.isNotBlank(formDTO.getCustomerId()), StaffPatrolRecordEntity :: getCustomerId, formDTO.getCustomerId());
 		List<StaffPatrolRecordEntity> list = baseDao.selectList(wrapper);
 		if (CollectionUtils.isNotEmpty(list)) {
 			list.forEach(item -> {