From 8537a164dbd4c8696c3269141a8f18922d4ed15f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 十月 2025 09:02:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationDisposeController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationDisposeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationDisposeController.java
index d0e754f..8cb3d6d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationDisposeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationDisposeController.java
@@ -64,7 +64,7 @@
         if (!isAdmin) {
             try {
                 // 获取当前用户的部门名称
-                String deptName = sysUserService.selectUserById(userId).getDept().getDeptName();
+                String deptName = sysUserService.selectUserById(userId).getDeptName();
                 
                 // 非超级管理员且非资产管理部,设置部门权限
                 if (!AssetDeptConstant.ASSET_DEPARTMENT_NAME.equals(deptName)) {

--
Gitblit v1.7.1