From cb51176ef5035f9712f30af69ae2e62ad292139e Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 21 Dec 2022 20:04:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=A2=E6=A0=A1=E7=94=A8=E6=88=B7=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/UniversitiesCollegesController.java   | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java
index 28801d84..a03352ca 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.validate.ValidateConfig;
+import com.ibeetl.admin.console.web.UserConsoleController;
 import com.ibeetl.admin.console.web.query.UserQuery;
 import com.ibeetl.admin.core.annotation.Function;
 import com.ibeetl.admin.core.entity.CoreUser;
@@ -15,6 +16,7 @@ import com.ibeetl.admin.core.util.HttpRequestLocal;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.jlw.entity.UniversitiesColleges;
+import com.ibeetl.jlw.entity.UniversitiesCollegesUserInfo;
 import com.ibeetl.jlw.entity.dto.CreateUserDTO;
 import com.ibeetl.jlw.service.UniversitiesCollegesService;
 import com.ibeetl.jlw.web.query.UniversitiesCollegesQuery;
@@ -87,6 +89,12 @@ public class UniversitiesCollegesController{
         }
     }
 
+    @ResponseBody
+    @PostMapping(API + "/userCenter.do")
+    public JsonResult info(@SCoreUser CoreUser coreUser) {
+        return JsonResult.success(universitiesCollegesService.userCenter());
+    }
+
 
     /* 后台页面 */
 
@@ -251,23 +259,23 @@ public class UniversitiesCollegesController{
         }
     }
 
-    @PostMapping(MODEL + "/userCenter.json")
-    @Function("universitiesColleges.query")
-    @ResponseBody
-    public JsonResult info(@SCoreUser CoreUser coreUser) {
-        return JsonResult.success(universitiesCollegesService.userCenter());
-    }
-
     /**
+     * 学校管理端-用户中心
+     * 编辑密码     方法：{@link UserConsoleController#editPassword} 接口地址：/admin/user/editPassword.json
+     * 修改用户信息 方法：{@link UniversitiesCollegesController#edit} 接口地址：/jlw/universitiesColleges/edit.json
+     *
      *@author 姚丹
      *@data 2022/11/28
-     * 用户中心
      */
     @GetMapping(MODEL + "/userCenter.do")
-    @Function("user.query")
+    @Function("universitiesColleges.query")
     public ModelAndView userCenter() {
         ModelAndView view = new ModelAndView("/other/userCenter.html");
         view.addObject("search", UserQuery.class.getName());
+
+        // 用户中心数据
+        UniversitiesCollegesUserInfo userCenterData = universitiesCollegesService.userCenter();
+        view.addObject("userCenterData", userCenterData);
         return view;
     }
 }