个人注册返回值错误问题

sso-server/src/main/java/com/uas/sso/controller/PersonalRegisterController.java

@@ -107,7 +107,9 @@ public class PersonalRegisterController extends BaseController {
         registerLogger.info(Type.REGISTER_PERSONAL.getValue(), Step.FIRST.getValue(), "个人注册成功", user, user.getFromApp());
 
         // 注册成功后删除验证码token
-        tokenService.delete(t);
+        if (!StringUtils.isEmpty(t)) {
+            tokenService.delete(t);
+        }
         tokenService.delete(token);
 
         App app = appService.findOne(appId);
@@ -124,7 +126,7 @@ public class PersonalRegisterController extends BaseController {
             st.setData(JSON.toJSONString(userAccount));
             SSOHelper.setSSOCookie(request, response, st, true);
             return success(data);
-        } else if ("city".equals(appId) || "city".equals(app.getUserControl())) {
+        } else if ("city".equals(appId) || "city".equals(app == null ? "" : app.getUserControl())) {
             UserAccount userAccount = personalAccountService.findOneByUserUU(appId, user.getUserUU());
             userAccount.setLastLoginTime(null);
             List<String> loginUrls = appService.findAllLoginUrl();