From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructOtherBuildDAO.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructOtherBuildDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructOtherBuildDAO.java
index e419dd0..7c31dc7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructOtherBuildDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructOtherBuildDAO.java
@@ -45,7 +45,10 @@
             "join com_mng_struct_build_type t on b.type_id=t.id\n" +
             " <where>" +
             "<if test='comMngStructOtherBuildVO.name != null and comMngStructOtherBuildVO.name.trim() != &quot;&quot;'>" +
-            "b.name like concat(#{comMngStructOtherBuildVO.name},'%') "+
+            " and b.name like concat(#{comMngStructOtherBuildVO.name},'%') "+
+            " </if> " +
+            "<if test='comMngStructOtherBuildVO.communityId != null'>" +
+            " and b.community_id = #{comMngStructOtherBuildVO.communityId} "+
             " </if> " +
             " </where>" +
             " order by b.create_at desc" +

--
Gitblit v1.7.1