From a7002e25ec105e5f73c27f91944f1c0b4991c355 Mon Sep 17 00:00:00 2001 From: puhanshu <a9236326> Date: 星期四, 30 十二月 2021 14:23:41 +0800 Subject: [PATCH] Merge branch 'master' into test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.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/ComOpsHouseDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java index 462be53..285e32e 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java @@ -31,7 +31,7 @@ + " LEFT JOIN sys_user u ON d.user_id = u.user_id\n" + " LEFT JOIN com_mng_struct_area sa ON d.house_community_id = sa.id \n" + "where 1=1 " + "<if test='pageComOpsHouseDTO.communityId != null '>" - + "AND ( d.community_id = #{pageComOpsHouseDTO.communityId} or sa.community_id = #{pageComOpsHouseDTO.communityId} )\n" + + "AND ( d.community_id = ${pageComOpsHouseDTO.communityId} or sa.community_id = ${pageComOpsHouseDTO.communityId} )\n" + " </if> " + "<if test='pageComOpsHouseDTO.userId != null '>" + "AND d.user_id=#{pageComOpsHouseDTO.userId} \n" + " </if> " @@ -45,7 +45,7 @@ + "AND d.brn <![CDATA[ >= ]]> 4 \n" + " </if> " + "<if test='pageComOpsHouseDTO.houseCommunityId != null '>" - + "AND d.house_community_id = #{pageComOpsHouseDTO.houseCommunityId} \n" + " </if> " + + "AND d.house_community_id = ${pageComOpsHouseDTO.houseCommunityId} \n" + " </if> " + "<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status < 4 '>" + "AND d.status=#{pageComOpsHouseDTO.status} \n" + " </if> " + "<if test='pageComOpsHouseDTO.status != null and pageComOpsHouseDTO.status ==4 '>" -- Gitblit v1.7.1