From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java | 81 +++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 47 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 6fec8e7..0493721 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
@@ -1,17 +1,17 @@
package com.panzhihua.service_dangjian.dao;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
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;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -21,52 +21,39 @@
**/
@Mapper
public interface ComPbActivityMemberDAO extends BaseMapper<ComPbActivityMemberDO> {
-// @Select("<script> " +
-// " <where>" +
-// "<if test='nameCn != null and nameCn.trim() != ""'>" +
-// " </if> " +
-// "<if test='nameCn != null and nameCn.trim() != ""'>" +
-// " </if> " +
-// "<if test='nameCn != null and nameCn.trim() != ""'>" +
-// " </if> " +
-// " </where>" +
-// "</script>")
+ // @Select("<script> " +
+ // " <where>" +
+ // "<if test='nameCn != null and nameCn.trim() != ""'>" +
+ // " </if> " +
+ // "<if test='nameCn != null and nameCn.trim() != ""'>" +
+ // " </if> " +
+ // "<if test='nameCn != null and nameCn.trim() != ""'>" +
+ // " </if> " +
+ // " </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" +
- "<if test='pageActivityMembersVO.name != null and pageActivityMembersVO.name.trim() != ""'>" +
- "AND me.`name` = #{pageActivityMembersVO.name} \n" +
- " </if> " +
- "<if test='pageActivityMembersVO.phone != null and pageActivityMembersVO.phone.trim() != ""'>" +
- "AND u.phone = #{pageActivityMembersVO.phone}" +
- " </if> " +
- "</script>")
- IPage<PageActivityMembersVO> pageActivityMembers(Page page, @Param("pageActivityMembersVO") PageActivityMembersVO pageActivityMembersVO);
+ @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() != ""'>"
+ + "AND m.`name` = #{pageActivityMembersVO.name} " + " </if> "
+ + "<if test='pageActivityMembersVO.phone != null and pageActivityMembersVO.phone.trim() != ""'>"
+ + "AND u.phone = #{pageActivityMembersVO.phone}" + " </if> " + "</script>")
+ IPage<PageActivityMembersVO> pageActivityMembers(Page page,
+ @Param("pageActivityMembersVO") PageActivityMembersVO pageActivityMembersVO);
- @Select("select a.* from com_pb_activity_member a join com_pb_member m on m.id=a.member_id " +
- "join sys_user u on m.id_card=u.id_card and u.user_id=#{userId} where a.activity_id=#{id}")
+ @Select("select a.* from com_pb_activity_member a join com_pb_member m on m.id=a.member_id "
+ + "join sys_user u on m.id_card=u.id_card and u.user_id=#{userId} where a.activity_id=#{id}")
ComPbActivityMemberDO selectByUserIdActivityId(@Param("id") Long id, @Param("userId") Long userId);
- @Select("SELECT \n" +
- "u.user_id\n" +
- "FROM\n" +
- "com_pb_activity_member m \n" +
- "join com_pb_member b on m.member_id=b.id\n" +
- "join sys_user u on b.id_card=u.id_card\n" +
- "WHERE\n" +
- "m.activity_id =#{id}")
+
+ @Select("SELECT \n" + "u.user_id\n" + "FROM\n" + "com_pb_activity_member m \n"
+ + "join com_pb_member b on m.member_id=b.id\n" + "join sys_user u on b.id_card=u.id_card\n" + "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} ")
+
+ @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