From 1ac4ccef9c451711e07234357d9afce8468ca9d7 Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Mon, 25 May 2026 10:31:31 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260525-=E5=AE=A1=E6=89=B9=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=8A=9E=E7=90=86=E4=BA=BA?=
 =?UTF-8?q?=E7=9A=84=E9=83=A8=E9=97=A8id=E5=92=8C=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ExtActBpmLogServiceImpl.java | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/impl/ExtActBpmLogServiceImpl.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/impl/ExtActBpmLogServiceImpl.java
index ae17011..45f82eb 100644
--- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/impl/ExtActBpmLogServiceImpl.java
+++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/service/impl/ExtActBpmLogServiceImpl.java
@@ -120,7 +120,10 @@ public class ExtActBpmLogServiceImpl extends ServiceImpl<ExtActBpmLogMapper, Ext
         //写入新的审批意见表
         saveTaskApprovalOpinion(bpmlog, processInstance, RECORD_TYPE_PROCESS,
                 resolveHandleActionType(map, rejectDescription), resolveActionResult(reason, "同意"),
-                task != null ? task.getCreateTime() : null);
+                task != null ? task.getCreateTime() : null,
+                user != null ? user.getOrgId() : null,
+                resolveDeptName(username),
+                user != null ? user.getOrgCode() : null);
     }
 
     @Override
@@ -155,7 +158,10 @@ public class ExtActBpmLogServiceImpl extends ServiceImpl<ExtActBpmLogMapper, Ext
 
         saveTaskApprovalOpinion(taskLog, processInstance, RECORD_TYPE_SYSTEM,
                 resolveSystemActionType(comment), resolveActionResult(comment, "系统记录"),
-                task != null ? task.getCreateTime() : null);
+                task != null ? task.getCreateTime() : null,
+                user != null ? user.getOrgId() : null,
+                resolveDeptName(username),
+                user != null ? user.getOrgCode() : null);
     }
 
     /**
@@ -189,7 +195,10 @@ public class ExtActBpmLogServiceImpl extends ServiceImpl<ExtActBpmLogMapper, Ext
         this.baseMapper.insert(bpmlog);
 
         saveTaskApprovalOpinion(bpmlog, processInstance, RECORD_TYPE_PROCESS, ACTION_ADD_SIGN, resolveActionResult(reason, "加签"),
-                task != null ? task.getCreateTime() : null);
+                task != null ? task.getCreateTime() : null,
+                user != null ? user.getOrgId() : null,
+                resolveDeptName(username),
+                user != null ? user.getOrgCode() : null);
     }
 
     @Override
@@ -204,7 +213,7 @@ public class ExtActBpmLogServiceImpl extends ServiceImpl<ExtActBpmLogMapper, Ext
      */
     private void saveTaskApprovalOpinion(ExtActBpmLog bpmLog, ProcessInstance processInstance,
                                          String recordType, String actionType, String actionResult,
-                                         Date startTime) {
+                                         Date startTime, String opDeptId, String opDeptName, String opDeptCode) {
         try {
             TaskApprovalOpinion opinion = new TaskApprovalOpinion();
             opinion.setRecordType(recordType);
@@ -219,6 +228,9 @@ public class ExtActBpmLogServiceImpl extends ServiceImpl<ExtActBpmLogMapper, Ext
             opinion.setOpUserName(bpmLog.getOpUserName());
             opinion.setOpTime(bpmLog.getOpTime());
             opinion.setStartTime(startTime);
+            opinion.setOpDeptId(opDeptId);
+            opinion.setOpDeptName(opDeptName);
+            opinion.setOpDeptCode(opDeptCode);
             opinion.setDelFlag("0");
             opinion.setCreateBy(bpmLog.getOpUserId());
             opinion.setCreateTime(bpmLog.getOpTime());
@@ -232,6 +244,18 @@ public class ExtActBpmLogServiceImpl extends ServiceImpl<ExtActBpmLogMapper, Ext
         }
     }
 
+    private String resolveDeptName(String username) {
+        try {
+            List<String> names = sysBaseAPI.getDepartNamesByUsername(username);
+            if (names != null && !names.isEmpty()) {
+                return names.get(0);
+            }
+        } catch (Exception e) {
+            log.debug("获取部门名称失败, username={}", username, e);
+        }
+        return null;
+    }
+
     private String appendRejectDescription(String reason, String rejectDescription) {
         if (oConvertUtils.isNotEmpty(rejectDescription)) {
             return reason + "       【" + rejectDescription + "】";