From 58d7a02c4ed06a2ae9263fa5669b2c3b6d7a3f62 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 26 Oct 2022 23:55:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9Bean?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ibeetl/admin/core/service/CorePlatformService.java | 10 +++++-----
 .../com/ibeetl/admin/core/web/query/PageParam.java     |  2 +-
 .../TeacherOpenCourseMergeStudentControllerTest.java   |  4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java
index 03137588..89bab9ce 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java
@@ -83,7 +83,7 @@ public class CorePlatformService {
     @Autowired private CoreOrgDao sysOrgDao;
     @Autowired private CoreRoleFunctionDao sysRoleFunctionDao;
     @Autowired private CoreMenuDao sysMenuDao;
-    @Autowired private CoreUserDao sysUserDao;
+    @Autowired private CoreUserDao coreUserDao;
     @Autowired private CoreFunctionDao sysFunctionDao;
     @Autowired private CorePlatformService self;
     @Autowired private DataAccessFactory dataAccessFactory;
@@ -174,8 +174,8 @@ public class CorePlatformService {
 
     public MenuItem getMenuItem(long userId, long orgId) {
         System.out.println(userId);
-        System.out.println(sysUserDao);
-        CoreUser user = sysUserDao.unique(userId);
+        System.out.println(coreUserDao);
+        CoreUser user = coreUserDao.unique(userId);
         if (this.isSupperAdmin(user)) {
             return self.buildMenu();
         }
@@ -235,14 +235,14 @@ public class CorePlatformService {
     public boolean isAllowUserCode(String code){
         CoreUser coreUser = new CoreUser();
         coreUser.setCode(code);
-        List<CoreUser> coreUserList = sysUserDao.template(coreUser);
+        List<CoreUser> coreUserList = coreUserDao.template(coreUser);
         return !code.startsWith(ACCESS_SUPPER_ADMIN) && coreUserList.size() == 0;
     }
 
     public boolean isAllowUserCode(Long id,String code){
         CoreUser coreUser = new CoreUser();
         coreUser.setCode(code);
-        List<CoreUser> coreUserList = sysUserDao.template(coreUser);
+        List<CoreUser> coreUserList = coreUserDao.template(coreUser);
         for(int i=0;null != coreUserList && i<coreUserList.size();i++){
             if(!id.equals(coreUserList.get(i).getId())){
                 return false;
diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/web/query/PageParam.java b/admin-core/src/main/java/com/ibeetl/admin/core/web/query/PageParam.java
index d65d02fb..a8bf9f6c 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/web/query/PageParam.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/web/query/PageParam.java
@@ -12,7 +12,7 @@ import java.lang.reflect.Field;
  */
 public class PageParam {
     private Integer page = null;
-    private Integer limit = null;
+    private Integer limit = 10;
 
     public Integer getPage() {
         return page;
diff --git a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentControllerTest.java b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentControllerTest.java
index 9350c42d..25f1b871 100644
--- a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentControllerTest.java
+++ b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentControllerTest.java
@@ -130,7 +130,9 @@ class TeacherOpenCourseMergeStudentControllerTest extends BaseTest {
         //构造请求参数
         RequestBuilder rb = MockMvcRequestBuilders.post(API + "/getPageList.do")
 //                    .param("studentSnOrName", "云夏")
-                .param("studentSnOrName", "1_002")
+                .param("studentSnOrName", "成锦")
+                .param("page", "1")
+                .param("limit", "10")
                 .param("teacherOpenCourseId", "1569699103338831872")
                 ;