java/zhihuishenqu.git

			@@ -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)) {
			@@ -1907,7 +1913,13 @@
			String encode = new BCryptPasswordEncoder().encode(eventGridMemberAddDTO.getPassword());
			eventGridMemberAddDTO.setPassword(encode);
			BeanUtils.copyProperties(eventGridMemberAddDTO, sysUserDO);
			if(!StringUtils.isEmpty(sysUserDO.getNickName())){
			sysUserDO.setName(sysUserDO.getNickName());
			}
			sysUserDO.setType(6);
			if(StringUtils.isEmpty(eventGridMemberAddDTO.getImageUrl())){
			sysUserDO.setImageUrl(Constants.ZONG_ZHI_GRID_MEMBER_IMAGE_URL);
			}
			int insert = 0;
			try {
			insert = userDao.insert(sysUserDO);
			@@ -1919,9 +1931,9 @@
			e.printStackTrace();
			log.error("新增后台用户报错【{}】", e.getMessage());
			if (e.getMessage().contains("union_phone_type")) {
			throw new ServiceException("手机号已经存在");
			return R.fail("手机号已经存在");
			} else if (e.getMessage().contains("union_account_type")) {
			throw new ServiceException("账户已经存在");
			return R.fail("账户已经存在");
			}
			}
			if(insert > 0){
			@@ -1974,9 +1986,9 @@
			e.printStackTrace();
			log.error("修改网格员用户报错【{}】", e.getMessage());
			if (e.getMessage().contains("union_phone_type")) {
			throw new ServiceException("手机号已经存在");
			return R.fail("手机号已经存在");
			} else if (e.getMessage().contains("union_account_type")) {
			throw new ServiceException("账户已经存在");
			return R.fail("账户已经存在");
			}
			}
			if(insert > 0){
			@@ -2025,4 +2037,15 @@
			userDao.gridMemberEditStatus(gridMemberEditDTO);
			return R.ok();
			}

			public R noTips(Long userId){
			SysUserDO userDO = this.userDao.selectById(userId);
			if(userDO != null){
			userDO.setBigAgeTips(2);
			if(this.userDao.updateById(userDO) > 0){
			return R.ok();
			}
			}
			return R.fail();
			}
			}