From 15dbac0af6437e16b6606d5c790d614851493f02 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 28 四月 2021 16:05:37 +0800
Subject: [PATCH] Merge branch 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 fdb8c3d..4d57485 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\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}")
@@ -339,8 +339,8 @@
"FROM\n" +
"\t sys_user u LEFT JOIN sys_user_role ur ON u.user_id = ur.user_id \n" +
"\t LEFT JOIN sys_role r ON ur.role_id = r.role_id \n" +
- "WHERE ur.role_id IS NOT NULL AND u.phone = #{phone} ")
- Integer selectCountSysUser(@Param("phone")String phone);
+ "WHERE ur.role_id IS NOT NULL AND u.phone = #{phone} and r.community_id=#{userCommunityId} ")
+ Integer selectCountSysUser(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId);
@Select("update com_shop_store set sys_user_id = #{sysUserId} where phone = #{phone}")
void updateStoreByPhone(@Param("phone")String phone, @Param("sysUserId")Long sysUserId);
--
Gitblit v1.7.1