java/zhihuishenqu.git

			@@ -22,6 +22,7 @@
			import com.panzhihua.common.service.community.CommunityWestService;
			import com.panzhihua.common.service.partybuilding.PartyBuildingService;
			import com.panzhihua.common.service.user.UserService;
			import com.panzhihua.common.utlis.StringUtils;
			import com.panzhihua.common.validated.AddGroup;
			import com.panzhihua.common.validated.PageGroup;
			import io.swagger.annotations.*;
			@@ -130,11 +131,16 @@

			@ApiOperation(value = "分页查询社区活动", response = ComActActivityVO.class)
			@PostMapping("pageactivity")
			public R pageActivity(@RequestBody ComActActivityVO comActActivityVO) {
			LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
			if (loginUserInfo != null) {
			comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
			public R pageActivity(@RequestBody ComActActivityVO comActActivityVO)
			{
			if(comActActivityVO.getCommunityId()<=0)
			{
			LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
			if (loginUserInfo != null) {
			comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
			}
			}

			comActActivityVO.setIsApplets(1);
			Integer status = comActActivityVO.getStatus();
			if (null != status && status.intValue() == 4) {

			@@ -401,7 +401,7 @@
			OR community_id = #{comActActivityVO.communityId})) t ON a.project_id = t.id
			<where>
			<if test="comActActivityVO.aattendPeople != null and comActActivityVO.aattendPeople != '' ">
			AND a.aattend_people = #{comActActivityVO.aattendPeople}
			a.aattend_people = #{comActActivityVO.aattendPeople}
			</if>
			</where>
			GROUP BY a.id ORDER BY a.status = 99 desc,a.publish_at DESC

	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史