From 3a64b401345bf59bd052882f5bda6ac513e84c94 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Sat, 28 Feb 2026 14:46:45 +0800
Subject: [PATCH] UserDisplay

---
 .../erf/controller/ErfExpApplyController.java      |  2 +-
 .../erf/service/impl/ErfExpApplyServiceImpl.java   |  6 +-----
 .../erf/service/impl/ErfFlowEngineServiceImpl.java | 14 +++++++-------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/erf/controller/ErfExpApplyController.java b/src/main/java/com/xujie/sys/modules/erf/controller/ErfExpApplyController.java
index 2c3e2b63..b300c704 100644
--- a/src/main/java/com/xujie/sys/modules/erf/controller/ErfExpApplyController.java
+++ b/src/main/java/com/xujie/sys/modules/erf/controller/ErfExpApplyController.java
@@ -269,7 +269,7 @@ public class ErfExpApplyController extends AbstractController {
         try {
             // 设置当前用户信息
             data.setPlannerUserId(getUserId());
-            data.setPlannerName(getUser().getUsername());
+            data.setPlannerName(getUser().getUserDisplay());
 
             erfExpApplyService.plannerSchedule(data);
             return R.ok("排产成功");
diff --git a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
index a8dac5a8..f3f6d862 100644
--- a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
@@ -766,10 +766,6 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
      * 获取节点中文名称
      */
     private String getNodeName(String nodeCode) {
-        if (nodeCode == null) {
-            return "";
-        }
-
         // 节点编码已经是中文，直接返回
         if (nodeCode == null) {
             return "";
@@ -926,7 +922,7 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
         saveApprovalLog(applyNo, "样品确认", entity.getCurrentStep(),
             String.format("样品确认完成：样品数量=%S, 样品状态=%s, 完成日期=%s",
                 finalQuantity+"", finalStatus, actualFinishDate),
-                getUserId(), getUser().getUsername());
+                getUserId(), getUser().getUserDisplay());
         // 更新流程节点状态为已完成
         erfFlowEngineService.completeFlow(applyNo);
 
diff --git a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfFlowEngineServiceImpl.java b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfFlowEngineServiceImpl.java
index 56f991a1..ffdb04d6 100644
--- a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfFlowEngineServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfFlowEngineServiceImpl.java
@@ -62,7 +62,7 @@ public class ErfFlowEngineServiceImpl implements ErfFlowEngineService {
         flowInstance.setApplyNo(applyNo);
         flowInstance.setFlowCode("EXP_APPLY_" + buCode);
         flowInstance.setFlowVersion(1);
-        flowInstance.setStatus("RUNNING");
+        flowInstance.setStatus("运行中");
         flowInstance.setStartTime(new Date());
         flowInstance.setCurrentNodeCode("技术经理审批");
         erfFlowInstanceMapper.insert(flowInstance);
@@ -88,7 +88,7 @@ public class ErfFlowEngineServiceImpl implements ErfFlowEngineService {
         nodeInstance.setReceiveTime(new Date());
         nodeInstance.setAssigneeUserId(assigneeUserId);  // 分配审批人
         // 根据审批人id查询审批人名称并设置到节点实例（冗余存储，方便查询和展示）
-        nodeInstance.setAssigneeName(sysUserDao.selectById(assigneeUserId).getUsername());
+        nodeInstance.setAssigneeName(sysUserDao.getUserDisplayById(assigneeUserId));
         erfFlowNodeInstanceMapper.insert(nodeInstance);
 
         log.info("流程启动成功，当前节点：技术经理审批，审批人ID：{}，尝试次数：{}", assigneeUserId, nextAttemptNo);
@@ -112,7 +112,7 @@ public class ErfFlowEngineServiceImpl implements ErfFlowEngineService {
         flowInstance.setApplyNo(applyNo);
         flowInstance.setFlowCode("EXP_APPLY_" + buCode);
         flowInstance.setFlowVersion(1);
-        flowInstance.setStatus("RUNNING");
+        flowInstance.setStatus("运行中");
         flowInstance.setStartTime(new Date());
         flowInstance.setCurrentNodeCode("技术经理审批");
 
@@ -135,7 +135,7 @@ public class ErfFlowEngineServiceImpl implements ErfFlowEngineService {
         nodeInstance.setReceiveTime(new Date());
         nodeInstance.setAssigneeUserId(techManagerId);  // 使用传入的技术经理ID
         // 根据审批人id查询审批人名称并设置到节点实例（冗余存储，方便查询和展示）
-        nodeInstance.setAssigneeName(sysUserDao.selectById(techManagerId).getUsername());
+        nodeInstance.setAssigneeName(sysUserDao.getUserDisplayById(techManagerId));
         erfFlowNodeInstanceMapper.insert(nodeInstance);
 
         log.info("流程启动成功，当前节点：技术经理审批，审批人ID：{}", techManagerId);
@@ -164,7 +164,7 @@ public class ErfFlowEngineServiceImpl implements ErfFlowEngineService {
         }
 
         // 2. 更新流程实例的审批人信息和状态
-        flowInstance.setStatus("RUNNING");
+        flowInstance.setStatus("运行中");
         flowInstance.setCurrentNodeCode("技术经理审批");
 
         // 更新审批人信息到remark字段
@@ -198,7 +198,7 @@ public class ErfFlowEngineServiceImpl implements ErfFlowEngineService {
         nodeInstance.setReceiveTime(new Date());
         nodeInstance.setAssigneeUserId(techManagerId);  // 使用新的技术经理ID
         // 根据审批人id查询审批人名称并设置到节点实例（冗余存储，方便查询和展示）
-        nodeInstance.setAssigneeName(sysUserDao.selectById(techManagerId).getUsername());
+        nodeInstance.setAssigneeName(sysUserDao.getUserDisplayById(techManagerId));
         erfFlowNodeInstanceMapper.insert(nodeInstance);
 
         log.info("流程重新启动成功，当前节点：技术经理审批，尝试次数：{}，审批人ID：{}",
@@ -348,7 +348,7 @@ public class ErfFlowEngineServiceImpl implements ErfFlowEngineService {
         nodeInstance.setReceiveTime(new Date());
         nodeInstance.setAssigneeUserId(assigneeUserId);
         // 根据审批人id查询审批人名称并设置到节点实例（冗余存储，方便查询和展示）
-        nodeInstance.setAssigneeName(sysUserDao.selectById(assigneeUserId).getUsername());
+        nodeInstance.setAssigneeName(sysUserDao.getUserDisplayById(assigneeUserId));
         erfFlowNodeInstanceMapper.insert(nodeInstance);
 
         log.info("创建节点实例: nodeCode={}, assigneeUserId={}, attemptNo={}",