浏览代码

管理员申述未注册用户申述报错bug

wangmh 7 年之前
父节点
当前提交
4712ff0fba

+ 4 - 1
sso-server/src/main/java/com/uas/sso/controller/AppealController.java

@@ -84,6 +84,9 @@ public class AppealController extends BaseController {
     public ModelMap resetPwd(Appeal appeal, @RequestParam String token, String code, String password) {
         // 获取申述人,将修改的账号作为申述人
         User user = userService.findByMobile(appeal.getMobile());
+        if (user == null) {
+            return error("该手机号未注册");
+        }
         Long submitterUU = user.getUserUU();
 
         // 校验token
@@ -124,7 +127,7 @@ public class AppealController extends BaseController {
 
         // 保存申述信息,把新管理员当作申请人
         User submitter = userService.findByMobile(appeal.getMobile());
-        appeal.setSubmitterUU(submitter.getUserUU());
+        appeal.setSubmitterUU(submitter == null ? null : submitter.getUserUU());
         appealService.submitChangeAdmin(appeal, userspace, checkSpace.getSpaceUU());
         return success();
     }

+ 1 - 1
sso-server/src/main/java/com/uas/sso/entity/Appeal.java

@@ -54,7 +54,7 @@ public class Appeal implements Serializable {
     /**
      * 申请人uu号
      */
-    @Column(name = "submitter_uu", nullable = false)
+    @Column(name = "submitter_uu")
     private Long submitterUU;
 
     /**