From bcc725e27bc2bcfcb598c26efb2df9ba9dda58ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Sun, 16 Jul 2023 17:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8=E8=80=83?=
=?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/src/assets/utils/index.js | 5 ++++-
.../admin/src/views/perform/attend/appeal/drawershow.vue | 4 +---
.../personal/service/impl/DingPersonServiceImpl.java | 3 +++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/attendance-performance-manager-ui/admin/src/assets/utils/index.js b/attendance-performance-manager-ui/admin/src/assets/utils/index.js
index b16c8f2b..2274900b 100644
--- a/attendance-performance-manager-ui/admin/src/assets/utils/index.js
+++ b/attendance-performance-manager-ui/admin/src/assets/utils/index.js
@@ -51,7 +51,10 @@ export const encodeURI = (data) => {
* @returns {string} val 瑙ｆ瀽鍚庣殑缁撴灉
*/
export function formatterDate(time) {
- console.log(time)
+ console.log("time",time)
+ if(time==='undefined'||time===null) {
+ return '--'}
+
if (!time) return '--';
let date = new Date(Number(time));
let Y = date.getFullYear() + '-';
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue
index d94c21d0..6d9474c6 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue
@@ -45,9 +45,7 @@
</el-row>
<el-row>
<el-col :span="10"
- >瀹為檯鎵撳崱鏃堕棿锛歿{
- formatterDate(form.actualAttendTime)
- }}</el-col
+ >瀹為檯鎵撳崱鏃堕棿锛歿{formatterDate(form.actualAttendTime)}}</el-col
>
<el-col :span="9"
>寮傚父缁撴灉锛歿{
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java
index 27773a29..72fe0f7c 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java
@@ -71,6 +71,9 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
req.setAgentId(agentId);
req.setUseridList(workMsgReq.getUseridList());
req.setMsg(JSON.toJSONString(workMsgReq.getMsg()));
+
+ workMsgReq.getMsg().getLink().setPicUrl("http://www.baidu.com");
+
log.info("sendWorkMsg:{}", JSON.toJSONString(workMsgReq));
OapiMessageCorpconversationAsyncsendV2Response rsp = client.execute(req, getToken());
log.info("OapiMessageResponse:{}", rsp.getBody());
--
2.24.3