mingfu 1 mesiac pred
rodič
commit
9329441223

+ 8 - 3
ie-admin/src/main/java/com/ruoyi/web/controller/front/UserController.java

@@ -2,10 +2,12 @@ package com.ruoyi.web.controller.front;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.AccessFromType;
 import com.ruoyi.common.enums.ExamType;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -39,7 +41,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/front/user")
 @Api(tags = "前台-用户")
-public class UserController {
+public class UserController extends BaseController {
     private final IDzControlService dzControlService;
     private final SysLoginService loginService;
     private final SysPermissionService permissionService;
@@ -143,11 +145,14 @@ public class UserController {
     @GetMapping("/getSchoolList")
     @Anonymous
     @ApiOperation("查询学校列表")
-    public AjaxResult getSchoolList(DzSchool dzSchool)
+    public TableDataInfo getSchoolList(@ApiParam("keyword") String keyword)
     {
+        DzSchool dzSchool = new DzSchool();
         dzSchool.setCampus(false);
+        dzSchool.setName(keyword);
+        startPage();
         List<DzSchool> list = dzSchoolService.selectDzSchoolList(dzSchool);
-        return AjaxResult.success(list);
+        return getDataTable(list);
     }
 
     @GetMapping("/getClassList")