java/zhihuishenqu.git

			@@ -338,7 +338,7 @@
			}
			if(comActActivityVO.getLimit()>0&&currentList.size()>0){
			if(comActActivityVO.getType()==3){
			if(comActActivityVO.getLimit()==currentList.size()\|\|currentList.get(currentList.size()-1).getEndTime()!=null){
			if(comActActivityVO.getLimit()==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
			comActActivityVO.setIsRegist(1);
			}
			}

			@@ -713,6 +713,9 @@
			comPbMemberDO.setSpecialtyCategory(partyBuildingMemberVO.getSpecialtyCategory());
			comPbMemberDO.setSpecialtyName(partyBuildingMemberVO.getSpecialtyName());
			}
			if(nonNull(partyBuildingMemberVO.getPhone())){
			comPbMemberDO.setPhone(partyBuildingMemberVO.getPhone());
			}

			Integer type = partyBuildingMemberVO.getType();
			if (nonNull(type) && type.equals(1)) {

			@@ -52,7 +52,7 @@
			<select id="queryAllByLimit" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO">
			select
			m.id, m.org_id, m.name, m.id_card, m.photo_path, m.join_time, m.employment_time, m.audit_result, m.create_at, m.update_at,
			m.community_id, m.user_id, m.refuse_reason, m.phone, m.type, m.position, m.check_unit_id, m.function, m.specialty_category,
			m.community_id, u.user_id, m.refuse_reason, m.phone, m.type, m.position, m.check_unit_id, m.function, m.specialty_category,
			m.specialty_name, m.position_two, o.`name` orgName,cpcu.name as checkUnitName,t2.partyTime,t2.partyInterval,
			TIMESTAMPDIFF(
			YEAR,
			@@ -94,7 +94,7 @@
			</if>
			<if test="dto.keyWord != null and dto.keyWord != ''">
			and (m.name like concat (#{dto.keyWord},'%') or
			u.phone like concat (#{dto.keyWord},'%') or
			m.phone like concat (#{dto.keyWord},'%') or
			cpcu.name like concat (#{dto.keyWord},'%')
			)
			</if>
			@@ -221,7 +221,7 @@
			cpm.id_card,
			cpm.phone,
			cpm.check_unit_id,
			cpm.user_id,
			t1.user_id,
			cpcu.`name` AS checkUnitName,
			cpm.org_id,
			cpm.community_id,
			@@ -234,6 +234,7 @@
			com_pb_member AS cpm
			LEFT JOIN com_pb_check_unit AS cpcu ON cpcu.id = cpm.check_unit_id
			LEFT JOIN com_pb_org AS cpo ON cpo.id = cpm.org_id
			LEFT JOIN sys_user t1 on cpm.id_card = t1.id_card
			<where>
			and cpm.audit_result = 1
			<if test="dto.communityId != null">

	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史