From 1ebbd7d5c83cc81e5cf94aa4d2a87a4ecd8a03c3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 03 三月 2022 10:04:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 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..9643015 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
@@ -20,24 +20,25 @@
  **/
 @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);
+
+    /**
+     * 根据身份证查询小程序用户id
+     * @param idCard 身份证
+     * @return  小程序用户id
+     */
+    Long getUserIdByIdCard(@Param("idCard") String idCard);
 
     /**
      * 根据手机号查询小程序用户id
@@ -51,4 +52,11 @@
 
     @Select("select * from com_pb_member_role where id=#{id}")
     PartyCommitteeVO selectPartyCommitteeById(@Param("id") Long id);
+
+    /**
+     * 根据身份证查询用户数量
+     * @param idCard    身份证号码
+     * @return  用户数量
+     */
+    Integer getSysUserByIdCardCount(@Param("idCard") String idCard);
 }

--
Gitblit v1.7.1