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 -> {