From a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 七月 2021 14:20:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java
index 383f612..963c03a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java
@@ -88,6 +88,9 @@
             "<if test='exportComMngCarExcelDTO.communityId != null and exportComMngCarExcelDTO.communityId != 0'>" +
             " and t.community_id = #{exportComMngCarExcelDTO.communityId} " +
             " </if> " +
+            "<if test='exportComMngCarExcelDTO.villageId != null and exportComMngCarExcelDTO.villageId != 0'>" +
+            " and t.village_id = #{exportComMngCarExcelDTO.villageId} " +
+            " </if> " +
             "<if test='exportComMngCarExcelDTO.userName != null and exportComMngCarExcelDTO.userName.trim() != &quot;&quot;'>" +
             " and t.user_name LIKE concat( #{exportComMngCarExcelDTO.userName}, '%' )  " +
             " </if> " +

--
Gitblit v1.7.1