From 6971fc90cbd6a623efa4b358fff40fb2f0edde76 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 13 五月 2021 13:32:55 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java | 5 +++--
1 files changed, 3 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 e18010f..feff5a7 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,10 +31,11 @@
"u.name userName,u.type as userType\n" +
"FROM\n" +
"com_ops_house d\n" +
- "JOIN sys_user u ON d.user_id = u.user_id\n" +
+ " 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} \n" +
+ "AND ( d.community_id=#{pageComOpsHouseDTO.communityId} or sa.community_id=#{pageComOpsHouseDTO.communityId} )\n" +
" </if> " +
--
Gitblit v1.7.1