From a75f7f771b5b937870a773e3ff01168efd1b18bb Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Wed, 26 Oct 2022 23:36:14 +0800 Subject: [PATCH 1/6] 1 --- admin-console/pom.xml | 2 +- admin-core/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-console/pom.xml b/admin-console/pom.xml index f667ad8d..c81aa117 100644 --- a/admin-console/pom.xml +++ b/admin-console/pom.xml @@ -7,7 +7,7 @@ com.ibeetl admin 1.3.1 - ../pom.xml + diff --git a/admin-core/pom.xml b/admin-core/pom.xml index c32deeba..16732612 100644 --- a/admin-core/pom.xml +++ b/admin-core/pom.xml @@ -7,7 +7,7 @@ com.ibeetl admin 1.3.1 - ../pom.xml + true From 58d7a02c4ed06a2ae9263fa5669b2c3b6d7a3f62 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Wed, 26 Oct 2022 23:55:55 +0800 Subject: [PATCH 2/6] =?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 coreUserList = sysUserDao.template(coreUser); + List 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 coreUserList = sysUserDao.template(coreUser); + List coreUserList = coreUserDao.template(coreUser); for(int i=0;null != coreUserList && i Date: Thu, 27 Oct 2022 00:00:20 +0800 Subject: [PATCH 3/6] 1 --- .../com/ibeetl/admin/core/service/CorePlatformService.java | 3 +++ 1 file changed, 3 insertions(+) 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 89bab9ce..fd3b04f9 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 @@ -1,5 +1,6 @@ package com.ibeetl.admin.core.service; +import cn.hutool.extra.spring.SpringUtil; import com.ibeetl.admin.core.dao.*; import com.ibeetl.admin.core.entity.*; import com.ibeetl.admin.core.rbac.DataAccessFactory; @@ -175,6 +176,8 @@ public class CorePlatformService { public MenuItem getMenuItem(long userId, long orgId) { System.out.println(userId); System.out.println(coreUserDao); + System.out.println(SpringUtil.getBean("coreUserDao").toString()); + CoreUser user = coreUserDao.unique(userId); if (this.isSupperAdmin(user)) { return self.buildMenu(); From ae20df883d54b2cb0cdd8c18c867a9aa2208fda3 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Thu, 27 Oct 2022 00:07:35 +0800 Subject: [PATCH 4/6] 1 --- .../com/ibeetl/admin/core/service/CorePlatformService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 fd3b04f9..e8e139dc 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 @@ -176,9 +176,9 @@ public class CorePlatformService { public MenuItem getMenuItem(long userId, long orgId) { System.out.println(userId); System.out.println(coreUserDao); - System.out.println(SpringUtil.getBean("coreUserDao").toString()); - - CoreUser user = coreUserDao.unique(userId); + CoreUserDao coreUserDao1 = (CoreUserDao)SpringUtil.getBean("coreUserDao"); + System.out.println(coreUserDao1); + CoreUser user = coreUserDao1.unique(userId); if (this.isSupperAdmin(user)) { return self.buildMenu(); } From bc321ca3301db099612a16f8557857be6c5e0f76 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Thu, 27 Oct 2022 00:12:27 +0800 Subject: [PATCH 5/6] 1 --- .../com/ibeetl/admin/core/service/CorePlatformService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 e8e139dc..1e33bf2b 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 @@ -175,8 +175,8 @@ public class CorePlatformService { public MenuItem getMenuItem(long userId, long orgId) { System.out.println(userId); - System.out.println(coreUserDao); - CoreUserDao coreUserDao1 = (CoreUserDao)SpringUtil.getBean("coreUserDao"); +// System.out.println(coreUserDao); + CoreUserDao coreUserDao1 = SpringUtil.getBean("coreUserDao"); System.out.println(coreUserDao1); CoreUser user = coreUserDao1.unique(userId); if (this.isSupperAdmin(user)) { From bd1e1669af1cfb25eb9b20c9f758edadfdf9ef65 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Thu, 27 Oct 2022 00:55:39 +0800 Subject: [PATCH 6/6] 1 --- .../com/ibeetl/admin/core/service/CorePlatformService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 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 1e33bf2b..7a62bc05 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 @@ -1,6 +1,5 @@ package com.ibeetl.admin.core.service; -import cn.hutool.extra.spring.SpringUtil; import com.ibeetl.admin.core.dao.*; import com.ibeetl.admin.core.entity.*; import com.ibeetl.admin.core.rbac.DataAccessFactory; @@ -176,9 +175,9 @@ public class CorePlatformService { public MenuItem getMenuItem(long userId, long orgId) { System.out.println(userId); // System.out.println(coreUserDao); - CoreUserDao coreUserDao1 = SpringUtil.getBean("coreUserDao"); - System.out.println(coreUserDao1); - CoreUser user = coreUserDao1.unique(userId); +// CoreUserDao coreUserDao1 = SpringUtil.getBean("coreUserDao"); +// System.out.println(coreUserDao1); + CoreUser user = coreUserDao.unique(userId); if (this.isSupperAdmin(user)) { return self.buildMenu(); }