社区党委

huanghongfa

2021-01-26 f1e14b2897a97db4b63707d58f5e7ef4b71bec0b

社区党委

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,6 +24,8 @@
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -408,7 +410,7 @@
      <workItem from="1611019208339" duration="94460000" />
      <workItem from="1611365644515" duration="33195000" />
      <workItem from="1611536010905" duration="21843000" />
      <workItem from="1611622682269" duration="6095000" />
      <workItem from="1611622682269" duration="7334000" />
    </task>
    <servers />
  </component>
@@ -464,54 +466,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
    <state width="1031" height="417" key="GridCell.Tab.0.bottom" timestamp="1611629105383">
    <state width="1031" height="417" key="GridCell.Tab.0.bottom" timestamp="1611629882001">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611629105383" />
    <state width="1031" height="417" key="GridCell.Tab.0.center" timestamp="1611629105383">
    <state width="1031" height="417" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611629882001" />
    <state width="1031" height="417" key="GridCell.Tab.0.center" timestamp="1611629882001">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611629105383" />
    <state width="1031" height="417" key="GridCell.Tab.0.left" timestamp="1611629105382">
    <state width="1031" height="417" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611629882001" />
    <state width="1031" height="417" key="GridCell.Tab.0.left" timestamp="1611629882001">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611629105382" />
    <state width="1031" height="417" key="GridCell.Tab.0.right" timestamp="1611629105383">
    <state width="1031" height="417" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611629882001" />
    <state width="1031" height="417" key="GridCell.Tab.0.right" timestamp="1611629882001">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611629105383" />
    <state width="1031" height="417" key="GridCell.Tab.1.bottom" timestamp="1611629105383">
    <state width="1031" height="417" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611629882001" />
    <state width="1031" height="417" key="GridCell.Tab.1.bottom" timestamp="1611629882001">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611629105383" />
    <state width="1031" height="417" key="GridCell.Tab.1.center" timestamp="1611629105383">
    <state width="1031" height="417" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611629882001" />
    <state width="1031" height="417" key="GridCell.Tab.1.center" timestamp="1611629882001">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611629105383" />
    <state width="1031" height="417" key="GridCell.Tab.1.left" timestamp="1611629105383">
    <state width="1031" height="417" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611629882001" />
    <state width="1031" height="417" key="GridCell.Tab.1.left" timestamp="1611629882001">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611629105383" />
    <state width="1031" height="417" key="GridCell.Tab.1.right" timestamp="1611629105383">
    <state width="1031" height="417" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611629882001" />
    <state width="1031" height="417" key="GridCell.Tab.1.right" timestamp="1611629882001">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611629105383" />
    <state width="1031" height="417" key="GridCell.Tab.2.bottom" timestamp="1611629105383">
    <state width="1031" height="417" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611629882001" />
    <state width="1031" height="417" key="GridCell.Tab.2.bottom" timestamp="1611629882001">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611629105383" />
    <state width="1031" height="417" key="GridCell.Tab.2.center" timestamp="1611629105383">
    <state width="1031" height="417" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611629882001" />
    <state width="1031" height="417" key="GridCell.Tab.2.center" timestamp="1611629882001">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611629105383" />
    <state width="1031" height="417" key="GridCell.Tab.2.left" timestamp="1611629105383">
    <state width="1031" height="417" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611629882001" />
    <state width="1031" height="417" key="GridCell.Tab.2.left" timestamp="1611629882001">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611629105383" />
    <state width="1031" height="417" key="GridCell.Tab.2.right" timestamp="1611629105383">
    <state width="1031" height="417" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611629882001" />
    <state width="1031" height="417" key="GridCell.Tab.2.right" timestamp="1611629882001">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611629105383" />
    <state width="1031" height="417" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611629882001" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -73,7 +73,14 @@
    @Select("select m.* from sys_user u join com_pb_member m on u.id_card=m.id_card where u.user_id=#{userId}")
    ComPbMemberDO selectByUserId(Long userId);

    @Select("select m.* from com_pb_member m join sys_user u on m.id_card=u.id_card where m.community_id=#{communityId}")
    @Select("SELECT\n" +
            "m.* \n" +
            "FROM\n" +
            "com_pb_member m\n" +
            "JOIN sys_user u ON m.id_card = u.id_card \n" +
            "LEFT JOIN com_pb_member_role r on m.id=r.member_id \n" +
            "WHERE\n" +
            "m.community_id =#{communityId} and r.id is null ")
    List<ComPbMemberDO> selectListRegister(Long communityId);
    @Select("select name from sys_user where user_id=#{createBy}")
    String selectNameByUserId(Long createBy);

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -190,6 +190,7 @@
    public R listPartyMember(Long communityId) {
//        List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getCommunityId,communityId));
//        查询社区所有已经注册的党员
//        排除掉已经成为党委的党员
        List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectListRegister(communityId);
        if (ObjectUtils.isEmpty(comPbMemberDOS)) {
           return R.ok(new ArrayList<>());