From 0ab77d6e1b6102b1fd14a134a9acb6d173f40d2b Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期四, 01 十二月 2022 17:30:57 +0800 Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealAssetsDAO.java | 1 + 1 files changed, 1 insertions(+), 0 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 d91546c..7a0c4f6 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 @@ -43,6 +43,7 @@ + " case t.floor_type when 1 then '高层' when 2 then '中层' when 3 then '低层' else '/' end floorType, " + " t.num, " + " t.square, " + " t.address " + "FROM " + " com_mng_real_assets t " + " LEFT JOIN com_mng_struct_build_type t2 ON t.build_type_id = t2.id" + + " WHERE 1= 1 " + "<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'>" -- Gitblit v1.7.1