Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/resources/application-prod.yml

@@ -41,7 +41,7 @@ openfeign:
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.202:80}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:8000}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:8000}
   REPORTFeign:
     url: ${REPORTFEIGN_URL:172.16.90.202:8000}
 #    url: ${REPORTFEIGN_URL:localhost:8055}

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1616,7 +1616,7 @@
             GROUP BY DRIVER_ID
             ) T ON T."driverId" = RP .PERSONNEL_ID
         </if>
-        WHERE RP.DELETED = 0
+        WHERE RP.DELETED != -1
         <if test="isNC!=null">
             AND RP.SOURCE_ID IS NOT NULL
         </if>