Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

admin-console/pom.xml

@@ -7,7 +7,7 @@
 		<groupId>com.ibeetl</groupId>
 		<artifactId>admin</artifactId>
 		<version>1.3.1</version>
-		<relativePath>../pom.xml</relativePath>
+<!--		<relativePath>../pom.xml</relativePath>-->
 	</parent>
 	<dependencies>
 		<dependency>

admin-core/pom.xml

@@ -7,7 +7,7 @@
 		<groupId>com.ibeetl</groupId>
 		<artifactId>admin</artifactId>
 		<version>1.3.1</version>
-		<relativePath>../pom.xml</relativePath>
+<!--		<relativePath>../pom.xml</relativePath>-->
 	</parent>
 	<properties>
 		<maven.test.skip>true</maven.test.skip>

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,10 @@ 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);
+//        CoreUserDao coreUserDao1 = SpringUtil.getBean("coreUserDao");
+//        System.out.println(coreUserDao1);
+        CoreUser user = coreUserDao.unique(userId);
         if (this.isSupperAdmin(user)) {
             return self.buildMenu();
         }
@@ -235,14 +237,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;

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;

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")
                 ;