beetlsql3-dev
Mlxa0324
parent 2eded36244
commit 30deb2d7c1

@ -3,12 +3,10 @@ package com.ibeetl.admin.core.dao;
import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.entity.CoreUser;
import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.BaseMapper;
import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.SqlResource;
import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
@SqlResource("core.coreUser") @SqlResource("core.coreUser")
@Repository
public interface CoreUserDao extends BaseMapper<CoreUser> { public interface CoreUserDao extends BaseMapper<CoreUser> {
/** /**

@ -1,5 +1,6 @@
package com.ibeetl.admin.core.service; package com.ibeetl.admin.core.service;
import cn.hutool.json.JSONUtil;
import com.ibeetl.admin.core.dao.*; import com.ibeetl.admin.core.dao.*;
import com.ibeetl.admin.core.entity.*; import com.ibeetl.admin.core.entity.*;
import com.ibeetl.admin.core.rbac.DataAccessFactory; import com.ibeetl.admin.core.rbac.DataAccessFactory;
@ -97,6 +98,7 @@ public class CorePlatformService {
public CoreUser getCurrentUser() { public CoreUser getCurrentUser() {
checkSession(); checkSession();
CoreUser user = (CoreUser) httpRequestLocal.getSessionValue(ACCESS_CURRENT_USER); CoreUser user = (CoreUser) httpRequestLocal.getSessionValue(ACCESS_CURRENT_USER);
System.out.println(JSONUtil.toJsonStr(user));
return user; return user;
} }
@ -173,7 +175,6 @@ public class CorePlatformService {
} }
public MenuItem getMenuItem(long userId, long orgId) { public MenuItem getMenuItem(long userId, long orgId) {
log.debug("获取菜单传入的用户ID: " + userId);
CoreUser user = sysUserDao.unique(userId); CoreUser user = sysUserDao.unique(userId);
if (this.isSupperAdmin(user)) { if (this.isSupperAdmin(user)) {
return self.buildMenu(); return self.buildMenu();

Loading…
Cancel
Save