diff --git a/src/main/java/com/casic/accessControl/event/web/EventController.java b/src/main/java/com/casic/accessControl/event/web/EventController.java
index 5f84082..5a693dd 100644
--- a/src/main/java/com/casic/accessControl/event/web/EventController.java
+++ b/src/main/java/com/casic/accessControl/event/web/EventController.java
@@ -149,7 +149,7 @@
             List<Marker> markerList = new ArrayList<>();
 
             if (markerDto.getIds().length() > 0) {
-                markerList = markerManager.getMarkerByIds(markerDto.getIds());
+                markerList = markerManager.getMarkerByMarkerIds(markerDto.getIds());
                 for (Marker m : markerList) {
                     TaskDetail taskDetail = new TaskDetail();
                     taskDetail.setMarkerId(m.getId());
@@ -165,10 +165,11 @@
                 for (int i = 0; i < taskDetails.size(); i++) {
                     taskDetailManager.save(taskDetails.get(i));
                 }
-                task.setEndDate(new Date());
-                task.setStatus(2);
-                taskManager.save(task);
+
             }
+            task.setEndDate(new Date());
+            task.setStatus(2);
+            taskManager.save(task);
         } catch (Exception e) {
             map.put("success", "false");
             map.put("message", e.getMessage());

diff --git a/src/main/java/com/casic/accessControl/event/web/EventController.java b/src/main/java/com/casic/accessControl/event/web/EventController.java
index 5f84082..5a693dd 100644
--- a/src/main/java/com/casic/accessControl/event/web/EventController.java
+++ b/src/main/java/com/casic/accessControl/event/web/EventController.java
@@ -149,7 +149,7 @@
             List<Marker> markerList = new ArrayList<>();
 
             if (markerDto.getIds().length() > 0) {
-                markerList = markerManager.getMarkerByIds(markerDto.getIds());
+                markerList = markerManager.getMarkerByMarkerIds(markerDto.getIds());
                 for (Marker m : markerList) {
                     TaskDetail taskDetail = new TaskDetail();
                     taskDetail.setMarkerId(m.getId());
@@ -165,10 +165,11 @@
                 for (int i = 0; i < taskDetails.size(); i++) {
                     taskDetailManager.save(taskDetails.get(i));
                 }
-                task.setEndDate(new Date());
-                task.setStatus(2);
-                taskManager.save(task);
+
             }
+            task.setEndDate(new Date());
+            task.setStatus(2);
+            taskManager.save(task);
         } catch (Exception e) {
             map.put("success", "false");
             map.put("message", e.getMessage());
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index d7b4951..ee9792e 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -171,6 +171,27 @@
         return Collections.emptyList();
     }
 
+
+
+    //获取marker
+    public List<Marker> getMarkerByMarkerIds(String ids) {
+        try {
+            ids = ids.trim();
+            if (ids.endsWith(",")) {
+                ids = ids.substring(0, ids.length() - 1);
+            }
+            String[] markerIds = ids.split(",");
+            Criteria criteria = this.createCriteria(Marker.class);
+            criteria.add(Restrictions.in("markerId", markerIds));
+            criteria.add(Restrictions.eq("isValid", 1));
+            List<Marker> markers = criteria.list();
+            return markers;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Collections.emptyList();
+    }
+
     public List<MarkerDto> getMarkerByMarkerId(String markerId) {
         if (markerId == null || StringUtils.isBlank(markerId)) {
             logger.info("ERROR,MarkerService->getMarkerByMarkerId,markerId is null");

diff --git a/src/main/java/com/casic/accessControl/event/web/EventController.java b/src/main/java/com/casic/accessControl/event/web/EventController.java
index 5f84082..5a693dd 100644
--- a/src/main/java/com/casic/accessControl/event/web/EventController.java
+++ b/src/main/java/com/casic/accessControl/event/web/EventController.java
@@ -149,7 +149,7 @@
             List<Marker> markerList = new ArrayList<>();
 
             if (markerDto.getIds().length() > 0) {
-                markerList = markerManager.getMarkerByIds(markerDto.getIds());
+                markerList = markerManager.getMarkerByMarkerIds(markerDto.getIds());
                 for (Marker m : markerList) {
                     TaskDetail taskDetail = new TaskDetail();
                     taskDetail.setMarkerId(m.getId());
@@ -165,10 +165,11 @@
                 for (int i = 0; i < taskDetails.size(); i++) {
                     taskDetailManager.save(taskDetails.get(i));
                 }
-                task.setEndDate(new Date());
-                task.setStatus(2);
-                taskManager.save(task);
+
             }
+            task.setEndDate(new Date());
+            task.setStatus(2);
+            taskManager.save(task);
         } catch (Exception e) {
             map.put("success", "false");
             map.put("message", e.getMessage());
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index d7b4951..ee9792e 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -171,6 +171,27 @@
         return Collections.emptyList();
     }
 
+
+
+    //获取marker
+    public List<Marker> getMarkerByMarkerIds(String ids) {
+        try {
+            ids = ids.trim();
+            if (ids.endsWith(",")) {
+                ids = ids.substring(0, ids.length() - 1);
+            }
+            String[] markerIds = ids.split(",");
+            Criteria criteria = this.createCriteria(Marker.class);
+            criteria.add(Restrictions.in("markerId", markerIds));
+            criteria.add(Restrictions.eq("isValid", 1));
+            List<Marker> markers = criteria.list();
+            return markers;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Collections.emptyList();
+    }
+
     public List<MarkerDto> getMarkerByMarkerId(String markerId) {
         if (markerId == null || StringUtils.isBlank(markerId)) {
             logger.info("ERROR,MarkerService->getMarkerByMarkerId,markerId is null");
diff --git a/src/main/java/com/casic/accessControl/rs/TaskResource.java b/src/main/java/com/casic/accessControl/rs/TaskResource.java
index 0b87366..7d1e1e2 100644
--- a/src/main/java/com/casic/accessControl/rs/TaskResource.java
+++ b/src/main/java/com/casic/accessControl/rs/TaskResource.java
@@ -144,7 +144,6 @@
 
      * @return
      */
-    @GET
     @Path("uploadAppMarker")
     @Produces(MediaType.APPLICATION_JSON)
     public Map addAppMaskerTask(@QueryParam("taskId") String taskId,
@@ -156,7 +155,7 @@
             List<Marker> markerList = new ArrayList<>();
 
             if (ids.length() > 0) {
-                markerList = markerManager.getMarkerByIds(ids);
+                markerList = markerManager.getMarkerByMarkerIds(ids);
                 for (Marker m : markerList) {
                     TaskDetail taskDetail = new TaskDetail();
                     taskDetail.setMarkerId(m.getId());
@@ -172,10 +171,10 @@
                 for (int i = 0; i < taskDetails.size(); i++) {
                     taskDetailManager.save(taskDetails.get(i));
                 }
-                task.setEndDate(new Date());
-                task.setStatus(2);
-                taskManager.save(task);
             }
+            task.setEndDate(new Date());
+            task.setStatus(2);
+            taskManager.save(task);
         } catch (Exception e) {
             map.put("success", "false");
             map.put("message", e.getMessage());

diff --git a/src/main/java/com/casic/accessControl/event/web/EventController.java b/src/main/java/com/casic/accessControl/event/web/EventController.java
index 5f84082..5a693dd 100644
--- a/src/main/java/com/casic/accessControl/event/web/EventController.java
+++ b/src/main/java/com/casic/accessControl/event/web/EventController.java
@@ -149,7 +149,7 @@
             List<Marker> markerList = new ArrayList<>();
 
             if (markerDto.getIds().length() > 0) {
-                markerList = markerManager.getMarkerByIds(markerDto.getIds());
+                markerList = markerManager.getMarkerByMarkerIds(markerDto.getIds());
                 for (Marker m : markerList) {
                     TaskDetail taskDetail = new TaskDetail();
                     taskDetail.setMarkerId(m.getId());
@@ -165,10 +165,11 @@
                 for (int i = 0; i < taskDetails.size(); i++) {
                     taskDetailManager.save(taskDetails.get(i));
                 }
-                task.setEndDate(new Date());
-                task.setStatus(2);
-                taskManager.save(task);
+
             }
+            task.setEndDate(new Date());
+            task.setStatus(2);
+            taskManager.save(task);
         } catch (Exception e) {
             map.put("success", "false");
             map.put("message", e.getMessage());
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index d7b4951..ee9792e 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -171,6 +171,27 @@
         return Collections.emptyList();
     }
 
+
+
+    //获取marker
+    public List<Marker> getMarkerByMarkerIds(String ids) {
+        try {
+            ids = ids.trim();
+            if (ids.endsWith(",")) {
+                ids = ids.substring(0, ids.length() - 1);
+            }
+            String[] markerIds = ids.split(",");
+            Criteria criteria = this.createCriteria(Marker.class);
+            criteria.add(Restrictions.in("markerId", markerIds));
+            criteria.add(Restrictions.eq("isValid", 1));
+            List<Marker> markers = criteria.list();
+            return markers;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Collections.emptyList();
+    }
+
     public List<MarkerDto> getMarkerByMarkerId(String markerId) {
         if (markerId == null || StringUtils.isBlank(markerId)) {
             logger.info("ERROR,MarkerService->getMarkerByMarkerId,markerId is null");
diff --git a/src/main/java/com/casic/accessControl/rs/TaskResource.java b/src/main/java/com/casic/accessControl/rs/TaskResource.java
index 0b87366..7d1e1e2 100644
--- a/src/main/java/com/casic/accessControl/rs/TaskResource.java
+++ b/src/main/java/com/casic/accessControl/rs/TaskResource.java
@@ -144,7 +144,6 @@
 
      * @return
      */
-    @GET
     @Path("uploadAppMarker")
     @Produces(MediaType.APPLICATION_JSON)
     public Map addAppMaskerTask(@QueryParam("taskId") String taskId,
@@ -156,7 +155,7 @@
             List<Marker> markerList = new ArrayList<>();
 
             if (ids.length() > 0) {
-                markerList = markerManager.getMarkerByIds(ids);
+                markerList = markerManager.getMarkerByMarkerIds(ids);
                 for (Marker m : markerList) {
                     TaskDetail taskDetail = new TaskDetail();
                     taskDetail.setMarkerId(m.getId());
@@ -172,10 +171,10 @@
                 for (int i = 0; i < taskDetails.size(); i++) {
                     taskDetailManager.save(taskDetails.get(i));
                 }
-                task.setEndDate(new Date());
-                task.setStatus(2);
-                taskManager.save(task);
             }
+            task.setEndDate(new Date());
+            task.setStatus(2);
+            taskManager.save(task);
         } catch (Exception e) {
             map.put("success", "false");
             map.put("message", e.getMessage());
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1c66582..9d68524 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -15,15 +15,17 @@
 # ============================================================================
 # db
 # ============================================================================
-db.default.driverClassName=org.postgresql.Driver
-db.default.url=jdbc:postgresql://111.198.10.15:11209/smartwell_cms
-db.default.username=postgres
-db.default.password=Casic203
+db.default.driverClassName=com.mysql.jdbc.Driver
+#db.default.driverClassName=org.postgresql.Driver
+#db.default.url=jdbc:postgresql://111.198.10.15:11209/smartwell_cms
+#db.default.username=postgres
+#db.default.password=Casic203
 #db.default.username=emsweb
 #db.default.password=emsweb
-#db.default.url=jdbc:mysql://119.254.110.71:3307/ems?useUnicode=true&characterEncoding=UTF-8
-#db.default.username=root
-#db.default.password=rootems
+#db.default.url=jdbc:mysql://139.198.18.188:3306/ems_zq?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://139.198.18.188:3306/ems_zq?useUnicode=true&characterEncoding=UTF-8
+db.default.username=emsroot
+db.default.password=emsroot#203
 #
 ## ============================================================================
 # log4jdbc

diff --git a/src/main/java/com/casic/accessControl/event/web/EventController.java b/src/main/java/com/casic/accessControl/event/web/EventController.java
index 5f84082..5a693dd 100644
--- a/src/main/java/com/casic/accessControl/event/web/EventController.java
+++ b/src/main/java/com/casic/accessControl/event/web/EventController.java
@@ -149,7 +149,7 @@
             List<Marker> markerList = new ArrayList<>();
 
             if (markerDto.getIds().length() > 0) {
-                markerList = markerManager.getMarkerByIds(markerDto.getIds());
+                markerList = markerManager.getMarkerByMarkerIds(markerDto.getIds());
                 for (Marker m : markerList) {
                     TaskDetail taskDetail = new TaskDetail();
                     taskDetail.setMarkerId(m.getId());
@@ -165,10 +165,11 @@
                 for (int i = 0; i < taskDetails.size(); i++) {
                     taskDetailManager.save(taskDetails.get(i));
                 }
-                task.setEndDate(new Date());
-                task.setStatus(2);
-                taskManager.save(task);
+
             }
+            task.setEndDate(new Date());
+            task.setStatus(2);
+            taskManager.save(task);
         } catch (Exception e) {
             map.put("success", "false");
             map.put("message", e.getMessage());
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index d7b4951..ee9792e 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -171,6 +171,27 @@
         return Collections.emptyList();
     }
 
+
+
+    //获取marker
+    public List<Marker> getMarkerByMarkerIds(String ids) {
+        try {
+            ids = ids.trim();
+            if (ids.endsWith(",")) {
+                ids = ids.substring(0, ids.length() - 1);
+            }
+            String[] markerIds = ids.split(",");
+            Criteria criteria = this.createCriteria(Marker.class);
+            criteria.add(Restrictions.in("markerId", markerIds));
+            criteria.add(Restrictions.eq("isValid", 1));
+            List<Marker> markers = criteria.list();
+            return markers;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Collections.emptyList();
+    }
+
     public List<MarkerDto> getMarkerByMarkerId(String markerId) {
         if (markerId == null || StringUtils.isBlank(markerId)) {
             logger.info("ERROR,MarkerService->getMarkerByMarkerId,markerId is null");
diff --git a/src/main/java/com/casic/accessControl/rs/TaskResource.java b/src/main/java/com/casic/accessControl/rs/TaskResource.java
index 0b87366..7d1e1e2 100644
--- a/src/main/java/com/casic/accessControl/rs/TaskResource.java
+++ b/src/main/java/com/casic/accessControl/rs/TaskResource.java
@@ -144,7 +144,6 @@
 
      * @return
      */
-    @GET
     @Path("uploadAppMarker")
     @Produces(MediaType.APPLICATION_JSON)
     public Map addAppMaskerTask(@QueryParam("taskId") String taskId,
@@ -156,7 +155,7 @@
             List<Marker> markerList = new ArrayList<>();
 
             if (ids.length() > 0) {
-                markerList = markerManager.getMarkerByIds(ids);
+                markerList = markerManager.getMarkerByMarkerIds(ids);
                 for (Marker m : markerList) {
                     TaskDetail taskDetail = new TaskDetail();
                     taskDetail.setMarkerId(m.getId());
@@ -172,10 +171,10 @@
                 for (int i = 0; i < taskDetails.size(); i++) {
                     taskDetailManager.save(taskDetails.get(i));
                 }
-                task.setEndDate(new Date());
-                task.setStatus(2);
-                taskManager.save(task);
             }
+            task.setEndDate(new Date());
+            task.setStatus(2);
+            taskManager.save(task);
         } catch (Exception e) {
             map.put("success", "false");
             map.put("message", e.getMessage());
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1c66582..9d68524 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -15,15 +15,17 @@
 # ============================================================================
 # db
 # ============================================================================
-db.default.driverClassName=org.postgresql.Driver
-db.default.url=jdbc:postgresql://111.198.10.15:11209/smartwell_cms
-db.default.username=postgres
-db.default.password=Casic203
+db.default.driverClassName=com.mysql.jdbc.Driver
+#db.default.driverClassName=org.postgresql.Driver
+#db.default.url=jdbc:postgresql://111.198.10.15:11209/smartwell_cms
+#db.default.username=postgres
+#db.default.password=Casic203
 #db.default.username=emsweb
 #db.default.password=emsweb
-#db.default.url=jdbc:mysql://119.254.110.71:3307/ems?useUnicode=true&characterEncoding=UTF-8
-#db.default.username=root
-#db.default.password=rootems
+#db.default.url=jdbc:mysql://139.198.18.188:3306/ems_zq?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://139.198.18.188:3306/ems_zq?useUnicode=true&characterEncoding=UTF-8
+db.default.username=emsroot
+db.default.password=emsroot#203
 #
 ## ============================================================================
 # log4jdbc
diff --git a/src/main/webapp/content/task/task-gd.jsp b/src/main/webapp/content/task/task-gd.jsp
index a3b39c5..f9a6aba 100644
--- a/src/main/webapp/content/task/task-gd.jsp
+++ b/src/main/webapp/content/task/task-gd.jsp
@@ -84,7 +84,7 @@
 <input id="context" type="hidden" value="${ctx}">
 <!-- BEGIN HEADER -->
 <%@include file="/common/layout/header.jsp" %>
-<!-- END HEADER --
+<!-- END HEADER -->
 <!-- BEGIN CONTAINER -->
 <div class="page-container">
 
@@ -132,7 +132,7 @@
                                     <%--巡检员：<input class="search" placeholder="Search" hidden="hidden" style="width: 100px"/>--%>
                                     <div class="control-group">
                                         <div class="controls">
-                                            <select class="m-wrap" data-with-diselect="1" style="margin-top:10px"
+                                            <select class="m-wrap" data-with-diselect="1" style="margin-top:10px;margin-right:10px;"
                                                     data-placeholder="请选择巡检人员" tabindex="1" name="patrolerId"
                                                     id="selectPatroler3">
                                                 <option value=""></option>
@@ -357,7 +357,6 @@
         TaskGd.initList();
         TaskGd.initForm();
         TaskGd.initSelect();
-
         $("#point").on("click", TaskGd.moveMap);
         $("#drawRect").on("click", TaskGd.drawRect);
         $("#addTaskImage").on("click", TaskGd.selectMarkerCallBack);

diff --git a/src/main/java/com/casic/accessControl/event/web/EventController.java b/src/main/java/com/casic/accessControl/event/web/EventController.java
index 5f84082..5a693dd 100644
--- a/src/main/java/com/casic/accessControl/event/web/EventController.java
+++ b/src/main/java/com/casic/accessControl/event/web/EventController.java
@@ -149,7 +149,7 @@
             List<Marker> markerList = new ArrayList<>();
 
             if (markerDto.getIds().length() > 0) {
-                markerList = markerManager.getMarkerByIds(markerDto.getIds());
+                markerList = markerManager.getMarkerByMarkerIds(markerDto.getIds());
                 for (Marker m : markerList) {
                     TaskDetail taskDetail = new TaskDetail();
                     taskDetail.setMarkerId(m.getId());
@@ -165,10 +165,11 @@
                 for (int i = 0; i < taskDetails.size(); i++) {
                     taskDetailManager.save(taskDetails.get(i));
                 }
-                task.setEndDate(new Date());
-                task.setStatus(2);
-                taskManager.save(task);
+
             }
+            task.setEndDate(new Date());
+            task.setStatus(2);
+            taskManager.save(task);
         } catch (Exception e) {
             map.put("success", "false");
             map.put("message", e.getMessage());
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index d7b4951..ee9792e 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -171,6 +171,27 @@
         return Collections.emptyList();
     }
 
+
+
+    //获取marker
+    public List<Marker> getMarkerByMarkerIds(String ids) {
+        try {
+            ids = ids.trim();
+            if (ids.endsWith(",")) {
+                ids = ids.substring(0, ids.length() - 1);
+            }
+            String[] markerIds = ids.split(",");
+            Criteria criteria = this.createCriteria(Marker.class);
+            criteria.add(Restrictions.in("markerId", markerIds));
+            criteria.add(Restrictions.eq("isValid", 1));
+            List<Marker> markers = criteria.list();
+            return markers;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Collections.emptyList();
+    }
+
     public List<MarkerDto> getMarkerByMarkerId(String markerId) {
         if (markerId == null || StringUtils.isBlank(markerId)) {
             logger.info("ERROR,MarkerService->getMarkerByMarkerId,markerId is null");
diff --git a/src/main/java/com/casic/accessControl/rs/TaskResource.java b/src/main/java/com/casic/accessControl/rs/TaskResource.java
index 0b87366..7d1e1e2 100644
--- a/src/main/java/com/casic/accessControl/rs/TaskResource.java
+++ b/src/main/java/com/casic/accessControl/rs/TaskResource.java
@@ -144,7 +144,6 @@
 
      * @return
      */
-    @GET
     @Path("uploadAppMarker")
     @Produces(MediaType.APPLICATION_JSON)
     public Map addAppMaskerTask(@QueryParam("taskId") String taskId,
@@ -156,7 +155,7 @@
             List<Marker> markerList = new ArrayList<>();
 
             if (ids.length() > 0) {
-                markerList = markerManager.getMarkerByIds(ids);
+                markerList = markerManager.getMarkerByMarkerIds(ids);
                 for (Marker m : markerList) {
                     TaskDetail taskDetail = new TaskDetail();
                     taskDetail.setMarkerId(m.getId());
@@ -172,10 +171,10 @@
                 for (int i = 0; i < taskDetails.size(); i++) {
                     taskDetailManager.save(taskDetails.get(i));
                 }
-                task.setEndDate(new Date());
-                task.setStatus(2);
-                taskManager.save(task);
             }
+            task.setEndDate(new Date());
+            task.setStatus(2);
+            taskManager.save(task);
         } catch (Exception e) {
             map.put("success", "false");
             map.put("message", e.getMessage());
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1c66582..9d68524 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -15,15 +15,17 @@
 # ============================================================================
 # db
 # ============================================================================
-db.default.driverClassName=org.postgresql.Driver
-db.default.url=jdbc:postgresql://111.198.10.15:11209/smartwell_cms
-db.default.username=postgres
-db.default.password=Casic203
+db.default.driverClassName=com.mysql.jdbc.Driver
+#db.default.driverClassName=org.postgresql.Driver
+#db.default.url=jdbc:postgresql://111.198.10.15:11209/smartwell_cms
+#db.default.username=postgres
+#db.default.password=Casic203
 #db.default.username=emsweb
 #db.default.password=emsweb
-#db.default.url=jdbc:mysql://119.254.110.71:3307/ems?useUnicode=true&characterEncoding=UTF-8
-#db.default.username=root
-#db.default.password=rootems
+#db.default.url=jdbc:mysql://139.198.18.188:3306/ems_zq?useUnicode=true&characterEncoding=UTF-8
+db.default.url=jdbc:mysql://139.198.18.188:3306/ems_zq?useUnicode=true&characterEncoding=UTF-8
+db.default.username=emsroot
+db.default.password=emsroot#203
 #
 ## ============================================================================
 # log4jdbc
diff --git a/src/main/webapp/content/task/task-gd.jsp b/src/main/webapp/content/task/task-gd.jsp
index a3b39c5..f9a6aba 100644
--- a/src/main/webapp/content/task/task-gd.jsp
+++ b/src/main/webapp/content/task/task-gd.jsp
@@ -84,7 +84,7 @@
 <input id="context" type="hidden" value="${ctx}">
 <!-- BEGIN HEADER -->
 <%@include file="/common/layout/header.jsp" %>
-<!-- END HEADER --
+<!-- END HEADER -->
 <!-- BEGIN CONTAINER -->
 <div class="page-container">
 
@@ -132,7 +132,7 @@
                                     <%--巡检员：<input class="search" placeholder="Search" hidden="hidden" style="width: 100px"/>--%>
                                     <div class="control-group">
                                         <div class="controls">
-                                            <select class="m-wrap" data-with-diselect="1" style="margin-top:10px"
+                                            <select class="m-wrap" data-with-diselect="1" style="margin-top:10px;margin-right:10px;"
                                                     data-placeholder="请选择巡检人员" tabindex="1" name="patrolerId"
                                                     id="selectPatroler3">
                                                 <option value=""></option>
@@ -357,7 +357,6 @@
         TaskGd.initList();
         TaskGd.initForm();
         TaskGd.initSelect();
-
         $("#point").on("click", TaskGd.moveMap);
         $("#drawRect").on("click", TaskGd.drawRect);
         $("#addTaskImage").on("click", TaskGd.selectMarkerCallBack);
diff --git a/src/main/webapp/s/app/task/task-gd.js b/src/main/webapp/s/app/task/task-gd.js
index 084736e..30753e8 100644
--- a/src/main/webapp/s/app/task/task-gd.js
+++ b/src/main/webapp/s/app/task/task-gd.js
@@ -373,12 +373,12 @@
             TaskGd.updateList();
             //$('.sort').click();
             $('#btnSort').trigger("click");
-            $('#btnSort').trigger("click");
+            // $('#btnSort').trigger("click");
 
-            $('#btnSort').css("padding", 0);
-            $('#btnSort').css("padding-left", 10);
-            $('#btnSort').css("padding-right", 15);
-            $('#btnSort').css("margin-bottom", 10);
+            // $('#btnSort').css("padding", 0);
+            // $('#btnSort').css("padding-left", 10);
+            // $('#btnSort').css("padding-right", 15);
+            $('#btnSort').css("margin-left", 10);
 
             TaskGd.bindClickEvent();
 
@@ -434,6 +434,9 @@
 
                             }
                             TaskGd.addTaskDetailMarker(taskDetailLists);
+                            if(taskDetailLists.length==0){
+                                alert("未探测到标识器！");
+                            }
                         }
                         else {
                             alert(r.message);