diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
index 0d854c7..11c4d0e 100644
--- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
+++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
@@ -106,11 +106,11 @@
                     //获取当前时段信息
                     Map<String, String> map = getStartAndEndTime(times);
                     Long carId = busCarInfo.getId();
-                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
-                        carId = 5L;
-                        map.put("start", "2021-05-26 10:15:00");
-                        map.put("end", "2021-05-26 12:00:00");
-                    }
+//                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
+//                        carId = 5L;
+//                        map.put("start", "2021-05-26 10:15:00");
+//                        map.put("end", "2021-05-26 12:00:00");
+//                    }
                     //获取规定时间内 车辆定位数据
                     List<BusCarPosition> carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end"));
                     alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions);

diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
index 0d854c7..11c4d0e 100644
--- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
+++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
@@ -106,11 +106,11 @@
                     //获取当前时段信息
                     Map<String, String> map = getStartAndEndTime(times);
                     Long carId = busCarInfo.getId();
-                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
-                        carId = 5L;
-                        map.put("start", "2021-05-26 10:15:00");
-                        map.put("end", "2021-05-26 12:00:00");
-                    }
+//                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
+//                        carId = 5L;
+//                        map.put("start", "2021-05-26 10:15:00");
+//                        map.put("end", "2021-05-26 12:00:00");
+//                    }
                     //获取规定时间内 车辆定位数据
                     List<BusCarPosition> carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end"));
                     alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions);
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
index 207b30a..5a88ca4 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
@@ -56,10 +56,10 @@
             and HIREDATE  = #{hireDate}
         </if>
         <if test="jobCode!=null and jobCode!=''">
-            and JOBS like '%${jobCode}%'
+            and JOBS like  CONCAT('%',#{jobCode},'%')
         </if>
         <if test="responseArea != null and responseArea !=''">
-            and RESPONSE_AREA like '%${responseArea}%'
+            and RESPONSE_AREA like  CONCAT('%',#{responseArea},'%')
         </if>
     </select>
 

diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
index 0d854c7..11c4d0e 100644
--- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
+++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
@@ -106,11 +106,11 @@
                     //获取当前时段信息
                     Map<String, String> map = getStartAndEndTime(times);
                     Long carId = busCarInfo.getId();
-                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
-                        carId = 5L;
-                        map.put("start", "2021-05-26 10:15:00");
-                        map.put("end", "2021-05-26 12:00:00");
-                    }
+//                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
+//                        carId = 5L;
+//                        map.put("start", "2021-05-26 10:15:00");
+//                        map.put("end", "2021-05-26 12:00:00");
+//                    }
                     //获取规定时间内 车辆定位数据
                     List<BusCarPosition> carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end"));
                     alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions);
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
index 207b30a..5a88ca4 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
@@ -56,10 +56,10 @@
             and HIREDATE  = #{hireDate}
         </if>
         <if test="jobCode!=null and jobCode!=''">
-            and JOBS like '%${jobCode}%'
+            and JOBS like  CONCAT('%',#{jobCode},'%')
         </if>
         <if test="responseArea != null and responseArea !=''">
-            and RESPONSE_AREA like '%${responseArea}%'
+            and RESPONSE_AREA like  CONCAT('%',#{responseArea},'%')
         </if>
     </select>
 
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
index 413f6f7..53e3ada 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
@@ -45,7 +45,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
 
     </select>

diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
index 0d854c7..11c4d0e 100644
--- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
+++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
@@ -106,11 +106,11 @@
                     //获取当前时段信息
                     Map<String, String> map = getStartAndEndTime(times);
                     Long carId = busCarInfo.getId();
-                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
-                        carId = 5L;
-                        map.put("start", "2021-05-26 10:15:00");
-                        map.put("end", "2021-05-26 12:00:00");
-                    }
+//                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
+//                        carId = 5L;
+//                        map.put("start", "2021-05-26 10:15:00");
+//                        map.put("end", "2021-05-26 12:00:00");
+//                    }
                     //获取规定时间内 车辆定位数据
                     List<BusCarPosition> carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end"));
                     alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions);
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
index 207b30a..5a88ca4 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
@@ -56,10 +56,10 @@
             and HIREDATE  = #{hireDate}
         </if>
         <if test="jobCode!=null and jobCode!=''">
-            and JOBS like '%${jobCode}%'
+            and JOBS like  CONCAT('%',#{jobCode},'%')
         </if>
         <if test="responseArea != null and responseArea !=''">
-            and RESPONSE_AREA like '%${responseArea}%'
+            and RESPONSE_AREA like  CONCAT('%',#{responseArea},'%')
         </if>
     </select>
 
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
index 413f6f7..53e3ada 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
@@ -45,7 +45,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
 
     </select>
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
index 0a8847f..e90a582 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
@@ -46,7 +46,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
         <!--        <if test="sort!=null and sort!=''" >
                     order by ${sort} ${order}

diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
index 0d854c7..11c4d0e 100644
--- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
+++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
@@ -106,11 +106,11 @@
                     //获取当前时段信息
                     Map<String, String> map = getStartAndEndTime(times);
                     Long carId = busCarInfo.getId();
-                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
-                        carId = 5L;
-                        map.put("start", "2021-05-26 10:15:00");
-                        map.put("end", "2021-05-26 12:00:00");
-                    }
+//                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
+//                        carId = 5L;
+//                        map.put("start", "2021-05-26 10:15:00");
+//                        map.put("end", "2021-05-26 12:00:00");
+//                    }
                     //获取规定时间内 车辆定位数据
                     List<BusCarPosition> carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end"));
                     alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions);
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
index 207b30a..5a88ca4 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
@@ -56,10 +56,10 @@
             and HIREDATE  = #{hireDate}
         </if>
         <if test="jobCode!=null and jobCode!=''">
-            and JOBS like '%${jobCode}%'
+            and JOBS like  CONCAT('%',#{jobCode},'%')
         </if>
         <if test="responseArea != null and responseArea !=''">
-            and RESPONSE_AREA like '%${responseArea}%'
+            and RESPONSE_AREA like  CONCAT('%',#{responseArea},'%')
         </if>
     </select>
 
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
index 413f6f7..53e3ada 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
@@ -45,7 +45,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
 
     </select>
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
index 0a8847f..e90a582 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
@@ -46,7 +46,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
         <!--        <if test="sort!=null and sort!=''" >
                     order by ${sort} ${order}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
index 9933401..8a1e82d 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
@@ -42,7 +42,7 @@
             and TYPE  = #{type}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
         <!--        <if test="sort!=null and sort!=''" >
                     order by ${sort} ${order}

diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
index 0d854c7..11c4d0e 100644
--- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
+++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
@@ -106,11 +106,11 @@
                     //获取当前时段信息
                     Map<String, String> map = getStartAndEndTime(times);
                     Long carId = busCarInfo.getId();
-                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
-                        carId = 5L;
-                        map.put("start", "2021-05-26 10:15:00");
-                        map.put("end", "2021-05-26 12:00:00");
-                    }
+//                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
+//                        carId = 5L;
+//                        map.put("start", "2021-05-26 10:15:00");
+//                        map.put("end", "2021-05-26 12:00:00");
+//                    }
                     //获取规定时间内 车辆定位数据
                     List<BusCarPosition> carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end"));
                     alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions);
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
index 207b30a..5a88ca4 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
@@ -56,10 +56,10 @@
             and HIREDATE  = #{hireDate}
         </if>
         <if test="jobCode!=null and jobCode!=''">
-            and JOBS like '%${jobCode}%'
+            and JOBS like  CONCAT('%',#{jobCode},'%')
         </if>
         <if test="responseArea != null and responseArea !=''">
-            and RESPONSE_AREA like '%${responseArea}%'
+            and RESPONSE_AREA like  CONCAT('%',#{responseArea},'%')
         </if>
     </select>
 
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
index 413f6f7..53e3ada 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
@@ -45,7 +45,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
 
     </select>
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
index 0a8847f..e90a582 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
@@ -46,7 +46,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
         <!--        <if test="sort!=null and sort!=''" >
                     order by ${sort} ${order}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
index 9933401..8a1e82d 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
@@ -42,7 +42,7 @@
             and TYPE  = #{type}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
         <!--        <if test="sort!=null and sort!=''" >
                     order by ${sort} ${order}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
index a298c1d..c6634f1 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
@@ -46,7 +46,9 @@
     @Override
     public List<ToiletDto> list(String keywords, String owner, String position) {
         EntityWrapper<Toilet> query = new EntityWrapper<>();
+
         query.eq("DEL_FLAG", "0");
+
         if (StringUtils.isNotBlank(keywords)) {
             query.like("NAME", keywords);
             query.or();
@@ -94,7 +96,7 @@
             }
         });
         String sheetTitle = "公厕";
-        String[] title = new String[]{"名称", "编号", "地址", "经度", "纬度", "建设时间", "责任人", "责任人电话",
+        String[] title = new String[]{"名称", "编号", "位置", "经度", "纬度", "建设时间", "责任人", "责任人电话",
                 "建设单位", "占地面积", "备注"};
         String[] properties = new String[]{"name", "code", "position", "lng", "lat", "ts", "responsiblePerson",
                 "responsiblePersonTel", "owner", "area", "notes"};

diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
index 0d854c7..11c4d0e 100644
--- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
+++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
@@ -106,11 +106,11 @@
                     //获取当前时段信息
                     Map<String, String> map = getStartAndEndTime(times);
                     Long carId = busCarInfo.getId();
-                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
-                        carId = 5L;
-                        map.put("start", "2021-05-26 10:15:00");
-                        map.put("end", "2021-05-26 12:00:00");
-                    }
+//                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
+//                        carId = 5L;
+//                        map.put("start", "2021-05-26 10:15:00");
+//                        map.put("end", "2021-05-26 12:00:00");
+//                    }
                     //获取规定时间内 车辆定位数据
                     List<BusCarPosition> carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end"));
                     alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions);
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
index 207b30a..5a88ca4 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
@@ -56,10 +56,10 @@
             and HIREDATE  = #{hireDate}
         </if>
         <if test="jobCode!=null and jobCode!=''">
-            and JOBS like '%${jobCode}%'
+            and JOBS like  CONCAT('%',#{jobCode},'%')
         </if>
         <if test="responseArea != null and responseArea !=''">
-            and RESPONSE_AREA like '%${responseArea}%'
+            and RESPONSE_AREA like  CONCAT('%',#{responseArea},'%')
         </if>
     </select>
 
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
index 413f6f7..53e3ada 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
@@ -45,7 +45,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
 
     </select>
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
index 0a8847f..e90a582 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
@@ -46,7 +46,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
         <!--        <if test="sort!=null and sort!=''" >
                     order by ${sort} ${order}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
index 9933401..8a1e82d 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
@@ -42,7 +42,7 @@
             and TYPE  = #{type}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
         <!--        <if test="sort!=null and sort!=''" >
                     order by ${sort} ${order}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
index a298c1d..c6634f1 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
@@ -46,7 +46,9 @@
     @Override
     public List<ToiletDto> list(String keywords, String owner, String position) {
         EntityWrapper<Toilet> query = new EntityWrapper<>();
+
         query.eq("DEL_FLAG", "0");
+
         if (StringUtils.isNotBlank(keywords)) {
             query.like("NAME", keywords);
             query.or();
@@ -94,7 +96,7 @@
             }
         });
         String sheetTitle = "公厕";
-        String[] title = new String[]{"名称", "编号", "地址", "经度", "纬度", "建设时间", "责任人", "责任人电话",
+        String[] title = new String[]{"名称", "编号", "位置", "经度", "纬度", "建设时间", "责任人", "责任人电话",
                 "建设单位", "占地面积", "备注"};
         String[] properties = new String[]{"name", "code", "position", "lng", "lat", "ts", "responsiblePerson",
                 "responsiblePersonTel", "owner", "area", "notes"};
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 4ac81ff..e39560d 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <artifactId>casic-web</artifactId>
     <version>${pro.version}</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>casic-web</name>
     <description>casic web启动入口</description>
     <profiles>
@@ -149,7 +149,7 @@
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional>
         </dependency>
-      <!--引用car相关包-->
+        <!--引用car相关包-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-car-base</artifactId>
@@ -210,10 +210,10 @@
             <artifactId>ehcache</artifactId>
         </dependency>
         <!--需要分布式session的话需要放开注释-->
-            <dependency>
+        <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>
-            </dependency>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -282,17 +282,6 @@
                         <exclude>/config/**</exclude>
                         <exclude>**/MockController.class</exclude>
                     </excludes>
-                    <includes>
-                        <include>/config/application.yml</include>
-                    </includes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <warName>${fileName}</warName>
-                    <packagingExcludes>**/MockController.class</packagingExcludes>
                 </configuration>
             </plugin>
             <plugin>
@@ -356,7 +345,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
         <resources>
             <resource>

diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
index 0d854c7..11c4d0e 100644
--- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
+++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
@@ -106,11 +106,11 @@
                     //获取当前时段信息
                     Map<String, String> map = getStartAndEndTime(times);
                     Long carId = busCarInfo.getId();
-                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
-                        carId = 5L;
-                        map.put("start", "2021-05-26 10:15:00");
-                        map.put("end", "2021-05-26 12:00:00");
-                    }
+//                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
+//                        carId = 5L;
+//                        map.put("start", "2021-05-26 10:15:00");
+//                        map.put("end", "2021-05-26 12:00:00");
+//                    }
                     //获取规定时间内 车辆定位数据
                     List<BusCarPosition> carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end"));
                     alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions);
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
index 207b30a..5a88ca4 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
@@ -56,10 +56,10 @@
             and HIREDATE  = #{hireDate}
         </if>
         <if test="jobCode!=null and jobCode!=''">
-            and JOBS like '%${jobCode}%'
+            and JOBS like  CONCAT('%',#{jobCode},'%')
         </if>
         <if test="responseArea != null and responseArea !=''">
-            and RESPONSE_AREA like '%${responseArea}%'
+            and RESPONSE_AREA like  CONCAT('%',#{responseArea},'%')
         </if>
     </select>
 
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
index 413f6f7..53e3ada 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
@@ -45,7 +45,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
 
     </select>
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
index 0a8847f..e90a582 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
@@ -46,7 +46,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
         <!--        <if test="sort!=null and sort!=''" >
                     order by ${sort} ${order}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
index 9933401..8a1e82d 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
@@ -42,7 +42,7 @@
             and TYPE  = #{type}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
         <!--        <if test="sort!=null and sort!=''" >
                     order by ${sort} ${order}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
index a298c1d..c6634f1 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
@@ -46,7 +46,9 @@
     @Override
     public List<ToiletDto> list(String keywords, String owner, String position) {
         EntityWrapper<Toilet> query = new EntityWrapper<>();
+
         query.eq("DEL_FLAG", "0");
+
         if (StringUtils.isNotBlank(keywords)) {
             query.like("NAME", keywords);
             query.or();
@@ -94,7 +96,7 @@
             }
         });
         String sheetTitle = "公厕";
-        String[] title = new String[]{"名称", "编号", "地址", "经度", "纬度", "建设时间", "责任人", "责任人电话",
+        String[] title = new String[]{"名称", "编号", "位置", "经度", "纬度", "建设时间", "责任人", "责任人电话",
                 "建设单位", "占地面积", "备注"};
         String[] properties = new String[]{"name", "code", "position", "lng", "lat", "ts", "responsiblePerson",
                 "responsiblePersonTel", "owner", "area", "notes"};
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 4ac81ff..e39560d 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <artifactId>casic-web</artifactId>
     <version>${pro.version}</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>casic-web</name>
     <description>casic web启动入口</description>
     <profiles>
@@ -149,7 +149,7 @@
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional>
         </dependency>
-      <!--引用car相关包-->
+        <!--引用car相关包-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-car-base</artifactId>
@@ -210,10 +210,10 @@
             <artifactId>ehcache</artifactId>
         </dependency>
         <!--需要分布式session的话需要放开注释-->
-            <dependency>
+        <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>
-            </dependency>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -282,17 +282,6 @@
                         <exclude>/config/**</exclude>
                         <exclude>**/MockController.class</exclude>
                     </excludes>
-                    <includes>
-                        <include>/config/application.yml</include>
-                    </includes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <warName>${fileName}</warName>
-                    <packagingExcludes>**/MockController.class</packagingExcludes>
                 </configuration>
             </plugin>
             <plugin>
@@ -356,7 +345,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
         <resources>
             <resource>
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 78a1b63..6e7e040 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -16,7 +16,6 @@
  * @Date 2017/5/21 12:06
  */
 @SpringBootApplication
-@ServletComponentScan
 @EnableCaching
 @EnableTransactionManagement(proxyTargetClass = true)
 @EnableAsync

diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
index 0d854c7..11c4d0e 100644
--- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
+++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
@@ -106,11 +106,11 @@
                     //获取当前时段信息
                     Map<String, String> map = getStartAndEndTime(times);
                     Long carId = busCarInfo.getId();
-                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
-                        carId = 5L;
-                        map.put("start", "2021-05-26 10:15:00");
-                        map.put("end", "2021-05-26 12:00:00");
-                    }
+//                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
+//                        carId = 5L;
+//                        map.put("start", "2021-05-26 10:15:00");
+//                        map.put("end", "2021-05-26 12:00:00");
+//                    }
                     //获取规定时间内 车辆定位数据
                     List<BusCarPosition> carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end"));
                     alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions);
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
index 207b30a..5a88ca4 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
@@ -56,10 +56,10 @@
             and HIREDATE  = #{hireDate}
         </if>
         <if test="jobCode!=null and jobCode!=''">
-            and JOBS like '%${jobCode}%'
+            and JOBS like  CONCAT('%',#{jobCode},'%')
         </if>
         <if test="responseArea != null and responseArea !=''">
-            and RESPONSE_AREA like '%${responseArea}%'
+            and RESPONSE_AREA like  CONCAT('%',#{responseArea},'%')
         </if>
     </select>
 
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
index 413f6f7..53e3ada 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
@@ -45,7 +45,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
 
     </select>
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
index 0a8847f..e90a582 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
@@ -46,7 +46,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
         <!--        <if test="sort!=null and sort!=''" >
                     order by ${sort} ${order}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
index 9933401..8a1e82d 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
@@ -42,7 +42,7 @@
             and TYPE  = #{type}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
         <!--        <if test="sort!=null and sort!=''" >
                     order by ${sort} ${order}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
index a298c1d..c6634f1 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
@@ -46,7 +46,9 @@
     @Override
     public List<ToiletDto> list(String keywords, String owner, String position) {
         EntityWrapper<Toilet> query = new EntityWrapper<>();
+
         query.eq("DEL_FLAG", "0");
+
         if (StringUtils.isNotBlank(keywords)) {
             query.like("NAME", keywords);
             query.or();
@@ -94,7 +96,7 @@
             }
         });
         String sheetTitle = "公厕";
-        String[] title = new String[]{"名称", "编号", "地址", "经度", "纬度", "建设时间", "责任人", "责任人电话",
+        String[] title = new String[]{"名称", "编号", "位置", "经度", "纬度", "建设时间", "责任人", "责任人电话",
                 "建设单位", "占地面积", "备注"};
         String[] properties = new String[]{"name", "code", "position", "lng", "lat", "ts", "responsiblePerson",
                 "responsiblePersonTel", "owner", "area", "notes"};
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 4ac81ff..e39560d 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <artifactId>casic-web</artifactId>
     <version>${pro.version}</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>casic-web</name>
     <description>casic web启动入口</description>
     <profiles>
@@ -149,7 +149,7 @@
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional>
         </dependency>
-      <!--引用car相关包-->
+        <!--引用car相关包-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-car-base</artifactId>
@@ -210,10 +210,10 @@
             <artifactId>ehcache</artifactId>
         </dependency>
         <!--需要分布式session的话需要放开注释-->
-            <dependency>
+        <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>
-            </dependency>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -282,17 +282,6 @@
                         <exclude>/config/**</exclude>
                         <exclude>**/MockController.class</exclude>
                     </excludes>
-                    <includes>
-                        <include>/config/application.yml</include>
-                    </includes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <warName>${fileName}</warName>
-                    <packagingExcludes>**/MockController.class</packagingExcludes>
                 </configuration>
             </plugin>
             <plugin>
@@ -356,7 +345,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
         <resources>
             <resource>
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 78a1b63..6e7e040 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -16,7 +16,6 @@
  * @Date 2017/5/21 12:06
  */
 @SpringBootApplication
-@ServletComponentScan
 @EnableCaching
 @EnableTransactionManagement(proxyTargetClass = true)
 @EnableAsync
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index a46282c..0c77921 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -25,11 +25,13 @@
 ###################  mybatis-plus配置  ###################
 ###################  guns配置  ###################
 elasticjob:
-  enabled: false
+  enabled: true
   reg-center:
     serverLists: localhost:2181
     namespace: elasticjob-lite-springboot
     digest: admin:Casic203
+  dump:
+    enabled: true
 casic:
   swagger-open: false #是否开启swagger (true/false)
   kaptcha-open: false #是否开启登录时验证码 (true/false)

diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
index 0d854c7..11c4d0e 100644
--- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
+++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
@@ -106,11 +106,11 @@
                     //获取当前时段信息
                     Map<String, String> map = getStartAndEndTime(times);
                     Long carId = busCarInfo.getId();
-                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
-                        carId = 5L;
-                        map.put("start", "2021-05-26 10:15:00");
-                        map.put("end", "2021-05-26 12:00:00");
-                    }
+//                    if (busCarInfo.getId().equals(new Long(12)) && busRouteInfo.getId().equals(new Long(106))) {
+//                        carId = 5L;
+//                        map.put("start", "2021-05-26 10:15:00");
+//                        map.put("end", "2021-05-26 12:00:00");
+//                    }
                     //获取规定时间内 车辆定位数据
                     List<BusCarPosition> carPositions = carPositionSupportService.selectHistoryCarPosition(carId, map.get("start"), map.get("end"));
                     alarmProcessDTO.getPosData().setCarPositionDtoList(carPositions);
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
index 207b30a..5a88ca4 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dao/mapping/StaffMapper.xml
@@ -56,10 +56,10 @@
             and HIREDATE  = #{hireDate}
         </if>
         <if test="jobCode!=null and jobCode!=''">
-            and JOBS like '%${jobCode}%'
+            and JOBS like  CONCAT('%',#{jobCode},'%')
         </if>
         <if test="responseArea != null and responseArea !=''">
-            and RESPONSE_AREA like '%${responseArea}%'
+            and RESPONSE_AREA like  CONCAT('%',#{responseArea},'%')
         </if>
     </select>
 
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
index 413f6f7..53e3ada 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml
@@ -45,7 +45,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
 
     </select>
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
index 0a8847f..e90a582 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/TransferstationMapper.xml
@@ -46,7 +46,7 @@
             and OWNER  = #{owner}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
         <!--        <if test="sort!=null and sort!=''" >
                     order by ${sort} ${order}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
index 9933401..8a1e82d 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/WasteBinMapper.xml
@@ -42,7 +42,7 @@
             and TYPE  = #{type}
         </if>
         <if test="position != null and position !=''">
-            and POSITION like '%${position}%'
+            and POSITION like  CONCAT('%',#{position},'%')
         </if>
         <!--        <if test="sort!=null and sort!=''" >
                     order by ${sort} ${order}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
index a298c1d..c6634f1 100644
--- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java
@@ -46,7 +46,9 @@
     @Override
     public List<ToiletDto> list(String keywords, String owner, String position) {
         EntityWrapper<Toilet> query = new EntityWrapper<>();
+
         query.eq("DEL_FLAG", "0");
+
         if (StringUtils.isNotBlank(keywords)) {
             query.like("NAME", keywords);
             query.or();
@@ -94,7 +96,7 @@
             }
         });
         String sheetTitle = "公厕";
-        String[] title = new String[]{"名称", "编号", "地址", "经度", "纬度", "建设时间", "责任人", "责任人电话",
+        String[] title = new String[]{"名称", "编号", "位置", "经度", "纬度", "建设时间", "责任人", "责任人电话",
                 "建设单位", "占地面积", "备注"};
         String[] properties = new String[]{"name", "code", "position", "lng", "lat", "ts", "responsiblePerson",
                 "responsiblePersonTel", "owner", "area", "notes"};
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 4ac81ff..e39560d 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <artifactId>casic-web</artifactId>
     <version>${pro.version}</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>casic-web</name>
     <description>casic web启动入口</description>
     <profiles>
@@ -149,7 +149,7 @@
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional>
         </dependency>
-      <!--引用car相关包-->
+        <!--引用car相关包-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-car-base</artifactId>
@@ -210,10 +210,10 @@
             <artifactId>ehcache</artifactId>
         </dependency>
         <!--需要分布式session的话需要放开注释-->
-            <dependency>
+        <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>
-            </dependency>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -282,17 +282,6 @@
                         <exclude>/config/**</exclude>
                         <exclude>**/MockController.class</exclude>
                     </excludes>
-                    <includes>
-                        <include>/config/application.yml</include>
-                    </includes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <warName>${fileName}</warName>
-                    <packagingExcludes>**/MockController.class</packagingExcludes>
                 </configuration>
             </plugin>
             <plugin>
@@ -356,7 +345,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
         <resources>
             <resource>
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 78a1b63..6e7e040 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -16,7 +16,6 @@
  * @Date 2017/5/21 12:06
  */
 @SpringBootApplication
-@ServletComponentScan
 @EnableCaching
 @EnableTransactionManagement(proxyTargetClass = true)
 @EnableAsync
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index a46282c..0c77921 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -25,11 +25,13 @@
 ###################  mybatis-plus配置  ###################
 ###################  guns配置  ###################
 elasticjob:
-  enabled: false
+  enabled: true
   reg-center:
     serverLists: localhost:2181
     namespace: elasticjob-lite-springboot
     digest: admin:Casic203
+  dump:
+    enabled: true
 casic:
   swagger-open: false #是否开启swagger (true/false)
   kaptcha-open: false #是否开启登录时验证码 (true/false)
diff --git a/pom.xml b/pom.xml
index b2beffa..32295a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,59 +183,8 @@
                     <artifactId>spring-boot-maven-plugin</artifactId>
                     <version>1.5.9.RELEASE</version>
                 </plugin>
-                <plugin>
-                    <groupId>cn.smallbun.screw</groupId>
-                    <artifactId>screw-maven-plugin</artifactId>
-                    <version>${screw.version}</version>
-                    <dependencies>
-                        <!-- HikariCP -->
-                        <!--<dependency>-->
-                            <!--<groupId>com.zaxxer</groupId>-->
-                            <!--<artifactId>HikariCP</artifactId>-->
-                            <!--<version>${hikari.version}</version>-->
-                        <!--</dependency>-->
-                        <!--mysql driver-->
-                        <dependency>
-                            <groupId>mysql</groupId>
-                            <artifactId>mysql-connector-java</artifactId>
-                            <version>${mysql.version}</version>
-                        </dependency>
-                    </dependencies>
-                    <configuration>
-                        <!--username-->
-                        <username>root</username>
-                        <!--password-->
-                        <password>Casic203</password>
-                        <!--driver-->
-                        <!--com.mysql.jdbc.Driver -->
-                        <driverClassName>com.mysql.jdbc.Driver</driverClassName>
-                        <!--jdbc url-->
-                        <jdbcUrl>jdbc:mysql://11.100.6.163:3306/casic_optmonitoring?characterEncoding=utf8</jdbcUrl>
-                        <!--生成文件类型 HTML MD WORD-->
-                        <fileType>WORD</fileType>
-                        <!--打开文件输出目录-->
-                        <openOutputDir>true</openOutputDir>
-                        <!--生成模板-->
-                        <produceType>freemarker</produceType>
-                        <!--文档名称 为空时:将采用[数据库名称-描述-版本号]作为文档名称-->
-                        <!--描述-->
-                        <description>基础权限库</description>
-                        <!--版本-->
-                        <version>${pro.version}</version>
-                        <!--标题-->
-                        <title>基础库文档速查</title>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-
-                </plugin>
             </plugins>
         </pluginManagement>
+
     </build>
 </project>