From 6c3dcdcb89e181aac47e60a001dbe9e8921c8e79 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期三, 28 四月 2021 14:09:32 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index ad1b6d6..b919532 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -161,7 +161,7 @@
"from sys_user u\n" +
"left join com_act a on u.community_id=a.community_id\n" +
" where\n" +
- "u.type=1 and community_id is not null \n" +
+ "u.type=1 and u.community_id is not null \n" +
"<if test='pageUserAppletsBackstageDTO.phone != null and pageUserAppletsBackstageDTO.phone.trim() != ""'>" +
"and u.phone=#{pageUserAppletsBackstageDTO.phone}\n" +
" </if> " +
@@ -317,16 +317,16 @@
"FROM\n" +
"\t com_pb_member_role a \n" +
"WHERE\n" +
- "\t a.phone = #{phone}")
- Integer selectCountMemberRole(@Param("phone")String phone);
+ "\t a.phone = #{phone} and community_id=#{userCommunityId} ")
+ Integer selectCountMemberRole(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId);
@Select("SELECT\n" +
"\t COUNT(a.id)\n" +
"FROM\n" +
"\t com_pb_service_team a \n" +
"WHERE\n" +
- "\t a.phone = #{phone}")
- Integer selectCountTeam(@Param("phone")String phone);
+ "\t a.phone = #{phone} and community_id=#{userCommunityId} ")
+ Integer selectCountTeam(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId);
@Update("update com_pb_member_role u set u.phone=#{newphone},is_reg=1 where u.phone=#{oldphone}")
--
Gitblit v1.7.1