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 9827ddc4..4adecb43 100644 --- a/admin-core/pom.xml +++ b/admin-core/pom.xml @@ -7,7 +7,7 @@ com.ibeetl admin 1.3.1 - ../pom.xml + true 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..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 @@ -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 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