Explorar o código

Merge branch 'test' of jishutao/jitao-server into prod

liliang4869 %!s(int64=7) %!d(string=hai) anos
pai
achega
a7ec0f9054

+ 0 - 5
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -9,19 +9,14 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
-
-import com.alibaba.fastjson.JSON;
 import com.goafanti.achievement.bo.AchievementPartnerListBo;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.business.bo.JtBusinessProjectResult;
 import com.goafanti.business.service.JtBusinessService;
-import com.goafanti.common.bo.Result;
 import com.goafanti.common.enums.AchievementMaturity;
 import com.goafanti.common.model.JtBusinessProject;
-import com.goafanti.common.model.JtVoucher;
 import com.goafanti.common.model.UserInterest;
 import com.goafanti.common.service.DistrictGlossoryService;
 import com.goafanti.common.service.FieldGlossoryService;

+ 4 - 4
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -94,9 +94,9 @@ public class UserRegisterController extends BaseController {
 			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
 			return res;
 		}
-		if (user.getBeInviteCode()!=null&&userService.checkeToInviteCode(user.getBeInviteCode())) {
-			res.getError().add(buildError("邀请码不存在", "邀请码不存在"));
-			return res;
+		if (user.getBeInviteCode()!=null&&!user.getBeInviteCode().equals("")&&userService.checkeToInviteCode(user.getBeInviteCode())) {
+				res.getError().add(buildError("邀请码不存在", "邀请码不存在"));
+				return res;
 		}
 		if (res.getError().isEmpty()) {
 			User us = new User();
@@ -162,7 +162,7 @@ public class UserRegisterController extends BaseController {
 			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
 			return res;
 		}
-		if (user.getBeInviteCode()!=null&&userService.checkeToInviteCode(user.getBeInviteCode())) {
+		if (user.getBeInviteCode()!=null&&!user.getBeInviteCode().equals("")&&userService.checkeToInviteCode(user.getBeInviteCode())) {
 			res.getError().add(buildError("邀请码不存在", "邀请码不存在"));
 			return res;
 		}