From a858d0f96cd50b7587cd0ac7291e0432e48ac759 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 10:19:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProblemEscalationController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProblemEscalationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProblemEscalationController.java
index a64e98f..4fa2cc1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProblemEscalationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProblemEscalationController.java
@@ -71,10 +71,13 @@
TProblemEscalation byId = problemEscalationService.getById(id);
BeanUtils.copyProperties(byId,problemEscalationDetailVO);
TDictData byId1 = dictDataService.getById(byId.getEscalationType());
- SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId.getHandleId()));
- if (sysUser!=null){
- problemEscalationDetailVO.setHandleName(sysUser.getUserName());
+ if (byId.getHandleId()!=null){
+ SysUser sysUser = sysUserService.selectUserById(Long.valueOf(byId.getHandleId()));
+ if (sysUser!=null){
+ problemEscalationDetailVO.setHandleName(sysUser.getUserName());
+ }
}
+
problemEscalationDetailVO.setEscalationTypeName(byId1.getDataContent());
return R.ok(problemEscalationDetailVO);
}
--
Gitblit v1.7.1