党员下拉列表只展示已注册的党员

huanghongfa

2021-01-13 9a4873b18acd3bb607843a1cdc59383fda568b61

党员下拉列表只展示已注册的党员

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,6 +24,9 @@
  <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/model/dos/ComPbMemberDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.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" />
@@ -389,7 +392,7 @@
      <workItem from="1610326930387" duration="5497000" />
      <workItem from="1610368400707" duration="771000" />
      <workItem from="1610415637750" duration="6485000" />
      <workItem from="1610499071420" duration="8194000" />
      <workItem from="1610499071420" duration="9344000" />
    </task>
    <servers />
  </component>
@@ -441,54 +444,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="1610368574903" />
    <state width="1031" height="544" key="GridCell.Tab.0.bottom" timestamp="1610524991296">
    <state width="1031" height="544" key="GridCell.Tab.0.bottom" timestamp="1610526998051">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610524991296" />
    <state width="1031" height="544" key="GridCell.Tab.0.center" timestamp="1610524991296">
    <state width="1031" height="544" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.0.center" timestamp="1610526998051">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610524991296" />
    <state width="1031" height="544" key="GridCell.Tab.0.left" timestamp="1610524991296">
    <state width="1031" height="544" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.0.left" timestamp="1610526998051">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610524991296" />
    <state width="1031" height="544" key="GridCell.Tab.0.right" timestamp="1610524991296">
    <state width="1031" height="544" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.0.right" timestamp="1610526998051">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610524991296" />
    <state width="1031" height="544" key="GridCell.Tab.1.bottom" timestamp="1610524991297">
    <state width="1031" height="544" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.1.bottom" timestamp="1610526998051">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610524991297" />
    <state width="1031" height="544" key="GridCell.Tab.1.center" timestamp="1610524991297">
    <state width="1031" height="544" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.1.center" timestamp="1610526998051">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610524991297" />
    <state width="1031" height="544" key="GridCell.Tab.1.left" timestamp="1610524991297">
    <state width="1031" height="544" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.1.left" timestamp="1610526998051">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610524991297" />
    <state width="1031" height="544" key="GridCell.Tab.1.right" timestamp="1610524991297">
    <state width="1031" height="544" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.1.right" timestamp="1610526998051">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610524991297" />
    <state width="1031" height="544" key="GridCell.Tab.2.bottom" timestamp="1610524991297">
    <state width="1031" height="544" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.2.bottom" timestamp="1610526998051">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610524991297" />
    <state width="1031" height="544" key="GridCell.Tab.2.center" timestamp="1610524991297">
    <state width="1031" height="544" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.2.center" timestamp="1610526998051">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610524991297" />
    <state width="1031" height="544" key="GridCell.Tab.2.left" timestamp="1610524991297">
    <state width="1031" height="544" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.2.left" timestamp="1610526998051">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610524991297" />
    <state width="1031" height="544" key="GridCell.Tab.2.right" timestamp="1610524991297">
    <state width="1031" height="544" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.2.right" timestamp="1610526998051">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610524991297" />
    <state width="1031" height="544" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610072873414">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -509,10 +512,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609226181026" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610525871814">
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610527453215">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610525871814" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610527453215" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <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

@@ -10,6 +10,8 @@
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党员
@@ -53,7 +55,7 @@
            "com_pb_member m\n" +
            "LEFT JOIN sys_user u ON m.id_card = u.id_card\n" +
            "LEFT JOIN com_pb_org o ON m.org_id = o.id"+
            " <where>" +
            " where m.community_id=#{pagePartyOrganizationVO.communityId} " +
            "<if test='pagePartyOrganizationVO.orgName != null and pagePartyOrganizationVO.orgName.trim() != &quot;&quot;'>" +
            "and o.name=#{pagePartyOrganizationVO.orgName}"+
            " </if> " +
@@ -63,11 +65,14 @@
            "<if test='pagePartyOrganizationVO.name != null and pagePartyOrganizationVO.name.trim() != &quot;&quot;'>" +
            "and m.name=#{pagePartyOrganizationVO.name}"+
            " </if> " +
            " </where>" +

            "order by m.join_time desc "+
            "</script>")
    IPage<PartyBuildingMemberVO> pagePartyOrganization(Page page, @Param("pagePartyOrganizationVO") PagePartyOrganizationVO pagePartyOrganizationVO);

    @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}")
    List<ComPbMemberDO> selectListRegister(Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java

@@ -71,5 +71,9 @@
     * 修改时间
     */
    private Date updateAt;
    /**
     * 社区id
     */
    private Long communityId;

}

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

@@ -189,9 +189,11 @@
     */
    @Override
    public R listPartyMember(Long communityId) {
        List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(null);
//        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();
           return R.ok(new ArrayList<>());
        }
        List<PartyBuildingMemberVO> partyBuildingMemberVOS=new ArrayList<>();
        comPbMemberDOS.forEach(comPbMemberDO -> {