Merge remote-tracking branch 'bozhu-origin/4.x_dev' into 4.x_dev

# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
#	ruoyi-ui/src/views/monitor/operlog/index.vue
This commit is contained in:
Bozhu12 2023-10-28 11:11:00 +08:00
commit cb614eca06

View File

@ -126,6 +126,13 @@ public class LoginHelper {
return getLoginUser().getUsername(); return getLoginUser().getUsername();
} }
/**
* 获取用户部门名称
*/
public static String getDeptName() {
return getLoginUser().getDeptName();
}
/** /**
* 获取用户类型 * 获取用户类型
*/ */