diff --git a/backend/src/main/java/io/dataease/commons/constants/SysLogConstants.java b/backend/src/main/java/io/dataease/commons/constants/SysLogConstants.java index 3218776040..c6606211fa 100644 --- a/backend/src/main/java/io/dataease/commons/constants/SysLogConstants.java +++ b/backend/src/main/java/io/dataease/commons/constants/SysLogConstants.java @@ -55,7 +55,8 @@ public class SysLogConstants { DEPT(7, "SOURCE_TYPE_DEPT"), ROLE(8, "SOURCE_TYPE_ROLE"), DRIVER(9, "SOURCE_TYPE_DRIVER"), - DRIVER_FILE(10, "SOURCE_TYPE_DRIVER_FILE"); + DRIVER_FILE(10, "SOURCE_TYPE_DRIVER_FILE"), + MENU(11, "SOURCE_TYPE_MENU"); private Integer value; private String name; diff --git a/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml b/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml index bd0b9fad2c..e4ea15c486 100644 --- a/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml @@ -153,6 +153,17 @@ + + menu_id as id ,title as name + from sys_menu + + menu_id in + + #{id} + + + + diff --git a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java index 556e16e9ff..9cd0fa9f21 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java @@ -109,7 +109,7 @@ public class XAuthServer { return SysLogConstants.SOURCE_TYPE.DATASOURCE; } if (StringUtils.equals("menu", sourceType)) { - return SysLogConstants.SOURCE_TYPE.DATASOURCE; + return SysLogConstants.SOURCE_TYPE.MENU; } if (StringUtils.equals("dataset", sourceType)) { return SysLogConstants.SOURCE_TYPE.DATASET; diff --git a/backend/src/main/java/io/dataease/service/sys/log/LogManager.java b/backend/src/main/java/io/dataease/service/sys/log/LogManager.java index 254a719c28..0d15e29798 100644 --- a/backend/src/main/java/io/dataease/service/sys/log/LogManager.java +++ b/backend/src/main/java/io/dataease/service/sys/log/LogManager.java @@ -100,6 +100,9 @@ public class LogManager { case 7: typeValue = "dept"; break; + case 11: + typeValue = "menu"; + break; default: break; }