java/zhihuishenqu.git

			@@ -6,6 +6,7 @@
			import lombok.Data;

			import java.util.Date;
			import java.util.List;

			/**
			* @program: springcloud_k8s_panzhihuazhihuishequ
			@@ -38,6 +39,9 @@
			@ApiModelProperty(value = "社区id", hidden = true)
			private Long communityId;

			@ApiModelProperty(value = "社区id集合", hidden = true)
			private List<Long> communityIds;

			@ApiModelProperty(value = "关键词")
			private String keyWord;

			@@ -270,6 +270,15 @@
			}
			page.setSize(pageSize);
			page.setCurrent(pageNum);
			Long communityId = pagePartyOrganizationVO.getCommunityId();
			if (null != communityId){
			List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
			if (CollUtil.isEmpty(communityIds)) {
			communityIds = new ArrayList<>();
			communityIds.add(communityId);
			}
			pagePartyOrganizationVO.setCommunityIds(communityIds);
			}
			IPage<PartyBuildingMemberVO> iPage = comPbMemberWestDAO.queryAllByLimit(page, pagePartyOrganizationVO);
			iPage.getRecords().forEach(record -> {
			record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));

			@@ -62,16 +62,11 @@
			YEAR,
			m.employment_time,
			DATE_FORMAT( NOW(), '%Y-%m-%d' )) as partyAge,
			CASE

			WHEN u.id_card IS NULL THEN
			CASE WHEN su.id_card IS NULL THEN
			'未注册' ELSE '已注册'
			END status
			from com_pb_member_west as m
			LEFT JOIN (
			SELECT su.* FROM sys_user su
			LEFT JOIN com_act act ON su.community_id = act.community_id
			) u ON m.id_card = u.id_card and u.type = 1
			from com_pb_member as m
			LEFT JOIN sys_user su on m.id_card = su.id_card AND su.type = 1
			LEFT JOIN com_act act ON u.community_id = act.community_id
			LEFT JOIN com_pb_org o ON m.org_id = o.id
			LEFT JOIN com_pb_check_unit as cpcu ON m.check_unit_id = cpcu.id
			@@ -97,8 +92,11 @@
			<if test="dto.orgId != null">
			and m.org_id = #{dto.orgId}
			</if>
			<if test="dto.communityId != null">
			and m.community_id = ${dto.communityId}
			<if test="dto.communityIds != null and dto.communityIds.size() >0">
			and m.community_id IN
			<foreach collection="dto.communityIds" item="item" open="(" separator="," close=")">
			#{item}
			</foreach>
			</if>
			<if test="dto.keyWord != null and dto.keyWord != ''">
			and (m.name like concat (#{dto.keyWord},'%') or

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PagePartyOrganizationVO.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberWestMapper.xml	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史