From 7987ac6bf58cd64f0ad2af915ed1a9749960f643 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 16:10:47 +0800
Subject: [PATCH] 节点添加部门名
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
index 1e2dd04..52e6bee 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
@@ -91,16 +91,17 @@
List<OrderNodeVo> vos = new ArrayList<>();
EnforceComplaintLog order = this.getById(id);
if (order.getComplaintTime()!=null){
- vos.add(new OrderNodeVo("鍙戣捣鎶曡瘔",order.getCompanyUser(),order.getComplaintTime(), null));
+ vos.add(new OrderNodeVo("鍙戣捣鎶曡瘔",order.getCompanyUser(),order.getCompanyName(),order.getComplaintTime(), null));
}
- if (order.getInTime()!=null){
- vos.add(new OrderNodeVo("澶勭悊涓�",order.getInUser(),order.getInTime(), null));
+ if (order.getInTime()!=null && StringUtils.isNotEmpty(order.getInUser())){
+
+ vos.add(new OrderNodeVo("澶勭悊涓�",order.getInUser(), userService.getDeptNameByUserId(order.getInId()), order.getInTime(), null));
}
if (order.getResultTime()!=null){
if (order.getComplaintStatus()==-1){
- vos.add(new OrderNodeVo("宸查┏鍥�",order.getResultUser(),order.getResultTime(), order.getComplaintResult()));
+ vos.add(new OrderNodeVo("宸查┏鍥�",order.getResultUser(),userService.getDeptNameByUserId(order.getResultId()),order.getResultTime(), order.getComplaintResult()));
} else {
- vos.add(new OrderNodeVo("宸插姙缁�",order.getResultUser(),order.getResultTime(), order.getComplaintResult()));
+ vos.add(new OrderNodeVo("宸插姙缁�",order.getResultUser(),userService.getDeptNameByUserId(order.getResultId()),order.getResultTime(), order.getComplaintResult()));
}
}
return vos;
--
Gitblit v1.9.1