修改消息模板参数 优化参数信息

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkHandleServiceImpl.java

@@ -264,6 +264,7 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
                         workflowWorkNodeService.update(Wrappers.<WorkflowWorkNodeDO>lambdaUpdate()
                                 .eq(WorkflowWorkNodeDO::getId, nodeDO.getId())
                                 .set(WorkflowWorkNodeDO::getNodeProgress, "3"));
+                        // 发送消息
                         workflowWorkNodeService.sendMessageToAdmin(nodeDO.getId());
                     }
 

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkNodeServiceImpl.java

@@ -322,12 +322,19 @@ public class WorkflowWorkNodeServiceImpl extends ServiceImpl<WorkflowWorkNodeMap
             String nodeProgress = nodeDO.getNodeProgress();
             // 上锁/共锁
             List<WorkflowWorkNodeUserDO> nodeUserDOList = workflowWorkNodeUserService.list(Wrappers.<WorkflowWorkNodeUserDO>lambdaQuery().eq(WorkflowWorkNodeUserDO::getNodeId, nodeDO.getId()));
-            // 上锁人
+            // 上锁人数据
             List<Long> jtlockerIds = nodeUserDOList.stream().filter(o -> "jtlocker".equals(o.getType())).map(WorkflowWorkNodeUserDO::getUserId).toList();
             StringBuilder jtlockerName = new StringBuilder();
+            List<AdminUserDO> jtlockerList = new ArrayList<>();
+            if (!jtlockerIds.isEmpty()) {
+                jtlockerList = adminUserService.getUserList(jtlockerIds);
+                for (AdminUserDO adminUserDO : jtlockerList) {
+                    jtlockerName.append(adminUserDO.getNickname());
+                }
+            }
+            // 上锁人取钥匙
             if (!jtlockerIds.isEmpty() && StringUtils.isNotBlank(nodeProgress) && "1".equals(nodeProgress)) {
-                List<AdminUserDO> userList = adminUserService.getUserList(jtlockerIds);
-                for (AdminUserDO adminUserDO : userList) {
+                for (AdminUserDO adminUserDO : jtlockerList) {
                     // 发送
                     Map<String, Object> templateParams = new HashMap<>();
                     templateParams.put("name", adminUserDO.getNickname());
@@ -337,8 +344,7 @@ public class WorkflowWorkNodeServiceImpl extends ServiceImpl<WorkflowWorkNodeMap
             }
             // 上锁人归还钥匙
             if (!jtlockerIds.isEmpty() && StringUtils.isNotBlank(nodeProgress) && "2".equals(nodeProgress)) {
-                List<AdminUserDO> userList = adminUserService.getUserList(jtlockerIds);
-                for (AdminUserDO adminUserDO : userList) {
+                for (AdminUserDO adminUserDO : jtlockerList) {
                     // 发送
                     Map<String, Object> templateParams = new HashMap<>();
                     templateParams.put("name", adminUserDO.getNickname());
@@ -354,7 +360,7 @@ public class WorkflowWorkNodeServiceImpl extends ServiceImpl<WorkflowWorkNodeMap
                     // 发送
                     Map<String, Object> templateParams = new HashMap<>();
                     templateParams.put("name", adminUserDO.getNickname());
-                    templateParams.put("name1", jtlockerName);
+                    templateParams.put("user", jtlockerName);
                     sendMessage(nodeDO, adminUserDO.getId(), "MESSAGE_008", templateParams);
                 }
             }