1
0
suochencheng 7 лет назад
Родитель
Сommit
a77c5d20dd
1 измененных файлов с 13 добавлено и 7 удалено
  1. 13 7
      src/main/java/com/izouma/awesomeadmin/web/UserInfoController.java

+ 13 - 7
src/main/java/com/izouma/awesomeadmin/web/UserInfoController.java

@@ -43,7 +43,7 @@ import javax.servlet.http.HttpSession;
  */
 @Controller
 @RequestMapping("/userInfo")
-public class UserInfoController  {
+public class UserInfoController {
 
     @Autowired
     private UserInfoService userInfoService;
@@ -69,20 +69,26 @@ public class UserInfoController  {
     @RequestMapping(value = "/getUserInfo", method = RequestMethod.GET)
     @ResponseBody
     public Result getUserInfo(@RequestParam(required = false, value = "id") String id) {
-        if (StringUtils.isEmpty(id)) {
-            try {
+        try {
+            if (StringUtils.isEmpty(id)) {
                 Subject subject = SecurityUtils.getSubject();
                 UserInfo userInfo = (UserInfo) subject.getPrincipal();
                 if (userInfo != null) {
-                    return new Result(true, userInfo);
+                    id = userInfo.getId().toString();
+                } else {
+                    return new Result(false, "失败");
                 }
-            } catch (Exception ignored) {
+            }
 
+            UserInfo data = userInfoService.getUserInfoById(id);
+            if (data != null) {
+                return new Result(true, data);
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
-        UserInfo data = userInfoService.getUserInfoById(id);
-        return new Result(true, data);
+        return new Result(false, "失败");
     }
 
     /**