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/ComPbMemberRoleDAO.java |   59 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java
index 90dbd46..e467cd8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java
@@ -1,5 +1,6 @@
 package com.panzhihua.service_dangjian.dao;
 
+import com.panzhihua.common.model.vos.community.ComActVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -8,7 +9,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.partybuilding.PartyCommitteeVO;
+import com.panzhihua.common.model.vos.partybuilding.west.PartyCommitteeVO;
 import com.panzhihua.common.model.vos.user.SysUserVO;
 import com.panzhihua.service_dangjian.model.dos.ComPbMemberRoleDO;
 
@@ -20,35 +21,59 @@
  **/
 @Mapper
 public interface ComPbMemberRoleDAO extends BaseMapper<ComPbMemberRoleDO> {
-    // @Select("<script> " +
-    // " <where>" +
-    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
-    // " </if> " +
-    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
-    // " </if> " +
-    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
-    // " </if> " +
-    // " </where>" +
-    // "</script>")
-    @Select("<script> " + "SELECT\n" + "*,\n" + "TIMESTAMPDIFF(\n" + "YEAR,\n" + "t.birth_time,\n"
-        + "DATE_FORMAT( NOW(), '%Y-%m-%d' )) age\n" + "FROM\n" + "com_pb_member_role t\n" + "WHERE\n"
-        + "t.community_id = ${partyCommitteeVO.communityId} \n" + "</script>")
+
+    /**
+     * 分页查询党委列表
+     * @param page  分页参数
+     * @param partyCommitteeVO  请求参数
+     * @return  党委列表
+     */
     IPage<PartyCommitteeVO> pagePartyOrganization(Page page,
         @Param("partyCommitteeVO") PartyCommitteeVO partyCommitteeVO);
 
-    @Select("select * from sys_user where phone=#{phone} and type=1")
-    SysUserVO getSysUserByPhone(@Param("phone") String phone);
+
+
+    IPage<com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO> pagePartyOrganizations(Page page,
+                                                  @Param("partyCommitteeVO") com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO partyCommitteeVO);
+
+
+    @Select("select * from sys_user where phone=#{phone} AND app_id = #{appid} and type=1")
+    SysUserVO getSysUserByPhone(@Param("phone") String phone, @Param("appid") String appid);
+
+    /**
+     * 根据身份证查询小程序用户id
+     * @param idCard 身份证
+     * @param areaCode
+     * @return  小程序用户id
+     */
+    Long getUserIdByIdCard(@Param("idCard") String idCard, @Param("areaCode") String areaCode);
 
     /**
      * 根据手机号查询小程序用户id
      * @param phone 手机号
+     * @param appid
      * @return  小程序用户id
      */
-    Long getSysUserIdByPhone(@Param("phone") String phone);
+    Long getSysUserIdByPhone(@Param("phone") String phone, @Param("appid") String appid);
 
     @Update("update sys_user u set u.phone=#{newphone} where u.phone=#{oldphone}")
     void updateUserPhone(@Param("newphone") String newphone, @Param("oldphone") String oldphone);
 
     @Select("select * from com_pb_member_role where id=#{id}")
     PartyCommitteeVO selectPartyCommitteeById(@Param("id") Long id);
+
+    /**
+     * 根据身份证查询用户数量
+     * @param idCard    身份证号码
+     * @param areaCode
+     * @return  用户数量
+     */
+    Integer getSysUserByIdCardCount(@Param("idCard") String idCard, @Param("areaCode") String areaCode);
+
+    /**
+     * 获取社区信息
+     * @param communityId
+     * @return
+     */
+    ComActVO selectActById(@Param("communityId") Long communityId);
 }

--
Gitblit v1.7.1