From da8cca4d320908b672f439369e65e9e6a95374e3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 07 三月 2022 09:46:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into hemenkou_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealAssetsDAO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealAssetsDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealAssetsDAO.java
index b6d88d6..d91546c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealAssetsDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealAssetsDAO.java
@@ -32,7 +32,7 @@
+ "<if test='pageComMngRealAssetsDTO.name != null and pageComMngRealAssetsDTO.name.trim() != ""'>"
+ " and t.name LIKE concat( #{pageComMngRealAssetsDTO.name}, '%' ) " + " </if> "
+ "<if test='pageComMngRealAssetsDTO.communityId != null and pageComMngRealAssetsDTO.communityId != 0'>"
- + " and t.community_id = #{pageComMngRealAssetsDTO.communityId} " + " </if> " + " order by t.create_at desc"
+ + " and t.community_id = ${pageComMngRealAssetsDTO.communityId} " + " </if> " + " order by t.create_at desc"
+ "</script>")
IPage<ComMngRealAssetsVO> pageQueryComMngRealAssets(Page page,
@Param(value = "pageComMngRealAssetsDTO") PageComMngRealAssetsDTO pageComMngRealAssetsDTO);
@@ -46,7 +46,7 @@
+ "<if test='exportRealAssetsExcelDTO.name != null and exportRealAssetsExcelDTO.name.trim() != ""'>"
+ " and t.name LIKE concat( #{exportRealAssetsExcelDTO.name}, '%' ) " + " </if> "
+ "<if test='exportRealAssetsExcelDTO.communityId != null and exportRealAssetsExcelDTO.communityId != 0'>"
- + " and t.community_id = #{exportRealAssetsExcelDTO.communityId} " + " </if> " + " order by t.create_at desc"
+ + " and t.community_id = ${exportRealAssetsExcelDTO.communityId} " + " </if> " + " order by t.create_at desc"
+ "</script>")
List<ComMngRealAssetsExcelVO> exportRealAssetsExcel(
@Param(value = "exportRealAssetsExcelDTO") ExportRealAssetsExcelDTO exportRealAssetsExcelDTO);
--
Gitblit v1.7.1