From f83799020c1b0d5fe2a3c1a3a394ac5b7c738fe2 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Thu, 8 Aug 2024 14:05:27 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E9=A3=9E=E4=B9=A6?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B6=88=E6=81=AF=E7=9A=84=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E5=92=8C=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/docking/feishu/dto/InstanceDto.java |  6 ++++++
 .../service/impl/FeiShuDockingServiceImpl.java  | 17 +++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java
index c48e1332..ae2ac261 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java
@@ -71,4 +71,10 @@ public class InstanceDto {
     @ApiModelProperty("审批定义的类型")
     private Integer processType;
 
+    @ApiModelProperty("审批机器人消息的标题")
+    private String approvalBotTitle;
+
+    @ApiModelProperty("审批机器人消息的内容")
+    private String approvalBotContent;
+
 }
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java
index 153f4ee1..3a8f5e53 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java
@@ -290,11 +290,11 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
     private BotApprovalMessageDto buildBotApprovalMessageDto(InstanceDto instanceDto, ApprovalsInstanceVo approvalsInstanceVo) {
         BotApprovalMessageDto botApprovalMessageDto = new BotApprovalMessageDto();
         botApprovalMessageDto.setTemplateId("1008");
-        botApprovalMessageDto.setApprovalName(instanceDto.getTitle());
+        botApprovalMessageDto.setApprovalName(instanceDto.getApprovalBotTitle());
         botApprovalMessageDto.setReceivedUserId(approvalsInstanceVo.getTask_list().get(0).getUser_id());
         botApprovalMessageDto.setApplicantUserId(instanceDto.getPromoterUserId());
         botApprovalMessageDto.setTitleUserId(instanceDto.getPromoterUserId());
-        botApprovalMessageDto.setContent1(instanceDto.getTitle());
+        botApprovalMessageDto.setContent1(instanceDto.getApprovalBotContent());
         botApprovalMessageDto.setPcUrl(approvalsInstanceVo.getTask_list().get(0).getLinks().getPc_link());
         botApprovalMessageDto.setMobileUrl(approvalsInstanceVo.getTask_list().get(0).getLinks().getMobile_link());
         return botApprovalMessageDto;
@@ -832,11 +832,9 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
         // 构建字段数组
         List<JSONObject> fields = new ArrayList<>();
 
-        fields.add(createField("申请人", applicant, true));
-        fields.add(createField("", "", false));  // 空行
-        fields.add(createField("时间", leaveTime, false));
-        fields.add(createField("", "", false));  // 空行
-        fields.add(createField("备注", remarks, true));
+        fields.add(createField("", applicant, true));
+//        fields.add(createField("", "", false));  // 空行
+//        fields.add(createField("时间", leaveTime, false));
 
         // 创建 div 标签元素
         JSONObject divElement = new JSONObject();
@@ -850,7 +848,10 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
         buttonText.put("content", "查看详情");
         button.put("text", buttonText);
         button.put("type", "primary");
-        button.put("url", url);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("pc_url","https://www.baidu.com");
+        jsonObject.put("url","https://www.weibo.com");
+        button.put("multi_url",jsonObject);
 
         JSONObject actionElement = new JSONObject();
         actionElement.put("tag", "action");