From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 314149b..153e696 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
@@ -75,6 +75,7 @@
" SELECT " +
" t.area_name AS areaName, " +
" t.user_name AS userName, " +
+ " t.card_no AS cardNo, " +
" t.brand, " +
" t.plate_num AS plateNum, " +
" t.color, " +
@@ -85,11 +86,11 @@
"<if test='exportComMngCarExcelDTO.areaName != null and exportComMngCarExcelDTO.areaName.trim() != ""'>" +
" and t.area_name LIKE concat( #{exportComMngCarExcelDTO.areaName}, '%' ) " +
" </if> " +
- "<if test='exportComMngCarExcelDTO.communityId != null and exportComMngCarExcelDTO.communityId != 0'>" +
+ "<if test='exportComMngCarExcelDTO.communityId != null and exportComMngCarExcelDTO.communityId != ""'>" +
" and t.community_id = #{exportComMngCarExcelDTO.communityId} " +
" </if> " +
- "<if test='exportComMngCarExcelDTO.villageId != null and exportComMngCarExcelDTO.villageId != 0'>" +
- " and t.village_id = #{exportComMngCarExcelDTO.villageId} " +
+ "<if test='exportComMngCarExcelDTO.villageId != null and exportComMngCarExcelDTO.villageId != ""'>" +
+ " and t.area_id = #{exportComMngCarExcelDTO.villageId} " +
" </if> " +
"<if test='exportComMngCarExcelDTO.userName != null and exportComMngCarExcelDTO.userName.trim() != ""'>" +
" and t.user_name LIKE concat( #{exportComMngCarExcelDTO.userName}, '%' ) " +
--
Gitblit v1.7.1