From 0cab6d8afcc97e8bc94ef200e24d8839281f44c8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 15 Aug 2021 15:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java b/src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java
index 85d76a3..c001c92 100644
--- a/src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java
@@ -62,11 +62,11 @@
return baseMapper.getSecurityLocusInfoList(liveLocationVo);
}
//车辆
- if (liveLocationVo.getType()==1){
+ if (liveLocationVo.getType()==2){
return baseMapper.getCarLocusInfoList(liveLocationVo);
}
//枪支
- if (liveLocationVo.getType()==1){
+ if (liveLocationVo.getType()==3){
return baseMapper.getGunLocusInfoList(liveLocationVo);
}
return baseMapper.selectSecurityAndCarAndGunLiveLocationPage(liveLocationVo);
--
Gitblit v1.9.3