java/zhihuishenqu.git

			@@ -1364,10 +1364,10 @@
			ComActActivityInvite activityInvite = comActActivityInviteService.getBaseMapper().selectOne(new LambdaQueryWrapper<ComActActivityInvite>()
			.eq(ComActActivityInvite::getActivityId, activityId).eq(ComActActivityInvite::getUserId, userId));
			if (isNull(activityInvite)) {
			int count = pbMemberDAO.checkIsPbMember(userId);
			if (count < 1) {
			return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是党员");
			}
			// int count = pbMemberDAO.checkIsPbMember(userId);
			// if (count < 1) {
			// return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是党员");
			// }
			// 查询当前活动下参与志愿者
			Integer partyMemberCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
			.eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getSignIdentity, 2)
			@@ -1384,10 +1384,10 @@
			if (volunteerMax == null) {
			return R.fail("活动暂未对志愿者开放");
			}
			int count = pbMemberDAO.checkIsVolunteer(userId);
			if (count < 1) {
			return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是志愿者");
			}
			// int count = pbMemberDAO.checkIsVolunteer(userId);
			// if (count < 1) {
			// return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是志愿者");
			// }
			// 查询当前活动下参与志愿者
			Integer volunteerCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
			.eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getSignIdentity, 3).eq(ComActActSignDO::getStatus, 1));

			@@ -103,7 +103,7 @@
			<foreach collection="neighborCircleAdminDTO.communityIds" item="item" index="index" open="(" separator="," close=")">
			${item}
			</foreach>
			and is_del = 2
			and is_del = 2
			<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != ""'>
			and nc.release_content like concat('%',#{neighborCircleAdminDTO.releaseContent},'%')
			</if>

	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/jinhuiApi.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -35,7 +35,7 @@
			* 报名参数
			* @return 报名取消报名结果
			*/
			@PostMapping("jinhuiSignActivity")
			@PostMapping("/jinhuiSignActivity")
			public R jinhuiSignActivity(@RequestBody SignactivityVO signactivityVO)
			{
			return comActActivityService.jinhuiSignActivity(signactivityVO);