|
@@ -205,7 +205,7 @@ public class GroupLogicImpl extends BaseLogic implements GroupLogic {
|
|
|
@Override
|
|
@Override
|
|
|
public GroupVO joinGroup(HttpServletRequest request, long userId, GroupVO groupVO) {
|
|
public GroupVO joinGroup(HttpServletRequest request, long userId, GroupVO groupVO) {
|
|
|
|
|
|
|
|
- if ((groupVO.getCaptcha().equals("summer")) || CaptchaUtils.verifyPictureCaptcha(request, groupVO.getCaptcha())) {
|
|
|
|
|
|
|
+ if ( groupVO.getCaptcha()!=null && ( groupVO.getCaptcha().equals("summer") || CaptchaUtils.verifyPictureCaptcha(request, groupVO.getCaptcha()))) {
|
|
|
String managerName = groupVO.getManagerName();
|
|
String managerName = groupVO.getManagerName();
|
|
|
Group group = groupService.getGroup(groupVO.getId());
|
|
Group group = groupService.getGroup(groupVO.getId());
|
|
|
User user=userService.findByUserId(group.getOwnerId());
|
|
User user=userService.findByUserId(group.getOwnerId());
|