From de91c84954157bb9f8b6d938cbe0b1b51fb6e65d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 07 五月 2021 15:23:57 +0800
Subject: [PATCH] bugfixed:新增便民服务商家 报错

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java
index fe8d02a..13ce55c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO;
 import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
 import com.panzhihua.service_dangjian.model.dos.ComPbActivityMemberDO;
@@ -31,20 +32,19 @@
 //            " </where>" +
 //            "</script>")
 
-    @Select("<script> " +
-            "SELECT\n" +
-            "m.id,\n" +
-            "me.NAME,\n" +
-            "u.phone,\n" +
-            "m.create_at registrationTime \n" +
-            "FROM\n" +
-            "com_pb_activity_member m\n" +
-            "JOIN com_pb_member me ON m.member_id = me.id\n" +
-            "LEFT JOIN sys_user u ON me.id_card = u.id_card \n" +
-            "WHERE\n" +
-            "m.activity_id = #{pageActivityMembersVO.activityId} \n" +
+    @Select("<script>  " +
+            "SELECT " +
+            " m.id," +
+            " m.NAME," +
+            " u.phone," +
+            " m.create_at registrationTime" +
+            " FROM " +
+            " com_pb_activity_member m " +
+            " LEFT JOIN sys_user u ON m.user_id = u.user_id " +
+            "WHERE " +
+            "m.activity_id = #{pageActivityMembersVO.activityId} " +
             "<if test='pageActivityMembersVO.name != null and pageActivityMembersVO.name.trim() != &quot;&quot;'>" +
-            "AND me.`name` = #{pageActivityMembersVO.name} \n" +
+            "AND m.`name` = #{pageActivityMembersVO.name} " +
             " </if> " +
             "<if test='pageActivityMembersVO.phone != null and pageActivityMembersVO.phone.trim() != &quot;&quot;'>" +
             "AND u.phone = #{pageActivityMembersVO.phone}" +
@@ -64,4 +64,8 @@
             "WHERE\n" +
             "m.activity_id =#{id}")
     List<Long> selectAllPartyBuildingActivityMembers(Long id);
+    @Select("select m.id from sys_user u join com_pb_member m on u.id_card=m.id_card and u.community_id=#{communityId} and u.user_id=#{userId} ")
+    Long selectMemberIdByUserId(@Param("userId") Long userId, @Param("communityId") Long communityId);
+    @Select("select type from sys_user where user_id=#{createBy}")
+    LoginUserInfoVO selectUserInfo(Long createBy);
 }

--
Gitblit v1.7.1