java/zhihuishenqu.git

			@@ -7,6 +7,7 @@
			import com.panzhihua.common.model.vos.R;
			import com.panzhihua.common.model.vos.community.ComActVO;
			import com.panzhihua.common.model.vos.grid.EventDetailsVO;
			import com.panzhihua.common.model.vos.grid.EventGridMemberAdminVO;
			import com.panzhihua.common.model.vos.grid.EventVO;
			import com.panzhihua.common.service.grid.GridService;
			import com.panzhihua.common.utlis.ClazzUtils;
			@@ -167,4 +168,15 @@
			return gridService.dealEvent(commonEventDealDTO);
			}


			@ApiOperation(value = "查询当前社区所有网格员", response = EventGridMemberAdminVO.class)
			@PostMapping("/member/list")
			public R getGridMemberLists(){
			Long communityId = this.getCommunityId();
			if(communityId == null){
			return R.fail("请先登录");
			}
			return gridService.getGridMemberLists(communityId);
			}

			}

			@@ -139,6 +139,8 @@
			LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
			eventRevokeDTO.setUserId(loginUserInfoVO.getUserId());
			eventRevokeDTO.setUserName(loginUserInfoVO.getName());
			eventRevokeDTO.setCommunityName(loginUserInfoVO.getCommunityName());
			eventRevokeDTO.setCommunityId(loginUserInfoVO.getCommunityId());
			return gridService.markEventInvalid(eventRevokeDTO);
			}
			}

			@@ -237,6 +237,12 @@
			// 志愿者状态
			String phone = sysUserDO.getPhone();
			Long userCommunityId = sysUserDO.getCommunityId();
			if(userCommunityId!=null){
			ComActVO comActVO = userDao.selectCommunity(userCommunityId);
			if(comActVO!=null) {
			loginUserInfoVO.setCommunityName(comActVO.getName());
			}
			}
			if (!ObjectUtils.isEmpty(phone)) {
			ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
			if (ObjectUtils.isEmpty(comMngVolunteerMngVO)) {

	springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PublicityEventApi.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史