From 95e0d4cc43fc71346fe2140d6dc3bc564e8410be Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 25 Aug 2022 12:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E8=AE=A2=E9=98=85?=
 =?UTF-8?q?(=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index bef304927..a1fb3cefe 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -2909,23 +2909,23 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 if (ObjectUtils.isNotEmpty(value)) {
                                     if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) {
                                         if("1".equals(flag)){
-                                            sb.append(dbFieldTxt +" from "+ value + " to " + valueTemp + ",");
+                                            sb.append(dbFieldTxt +" from \""+ value + "\" to \"" + valueTemp + "\",");
                                         }else{
-                                            sb.append(dbFieldTxt + "由" + value + "改为" + valueTemp + ",");
+                                            sb.append(dbFieldTxt + "由\"" + value + "\"改为\"“" + valueTemp + "\",");
                                         }
                                     } else if (ObjectUtils.isEmpty(valueTemp)) {
                                         if("1".equals(flag)){
-                                            sb.append(dbFieldTxt + " from "+value + " to null " + ",");
+                                            sb.append(dbFieldTxt + " from \""+value + "\" to null " + ",");
                                         }else{
-                                            sb.append(dbFieldTxt + "由" + value + "改为空" + ",");
+                                            sb.append(dbFieldTxt + "由\"" + value + "\"改为空" + ",");
                                         }
                                     }
                                 } else {
                                     if (ObjectUtils.isNotEmpty(valueTemp)) {
                                         if("1".equals(flag)){
-                                            sb.append(dbFieldTxt + " from null to " + valueTemp + ",");
+                                            sb.append(dbFieldTxt + " from null to \"" + valueTemp + "\",");
                                         }else{
-                                            sb.append(dbFieldTxt + "由空改为" + valueTemp + ",");
+                                            sb.append(dbFieldTxt + "由空改为\"" + valueTemp + "\",");
                                         }
 
                                     }
@@ -2952,24 +2952,24 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                     if (fileNameListTemp.size() != 0 && !checkDiffrent) {
                                         if("1".equals(flag)){
                                             //sysUser
-                                            sb.append(dbFieldTxt +" from "+ StringUtils.join(fileNameList, ",") + " to " + StringUtils.join(fileNameListTemp, ",") + ",");
+                                            sb.append(dbFieldTxt +" from \""+ StringUtils.join(fileNameList, ",") + "\" to \"" + StringUtils.join(fileNameListTemp, ",") + "\",");
                                         }else{
-                                            sb.append(dbFieldTxt + "由" + StringUtils.join(fileNameList, ",") + "改为" + StringUtils.join(fileNameListTemp, ",") + ",");
+                                            sb.append(dbFieldTxt + "由\"" + StringUtils.join(fileNameList, ",") + "\"改为\"" + StringUtils.join(fileNameListTemp, ",") + "\",");
                                         }
                                     } else if (fileNameListTemp.size() == 0) {
                                         if("1".equals(flag)){
-                                            sb.append(dbFieldTxt + " from "+StringUtils.join(fileNameList, ",") + " to null " + ",");
+                                            sb.append(dbFieldTxt + " from \""+StringUtils.join(fileNameList, ",") + "\" to null " + ",");
                                         }else{
-                                            sb.append(dbFieldTxt + "由" + StringUtils.join(fileNameList, ",") + "改为空" + ",");
+                                            sb.append(dbFieldTxt + "由\"" + StringUtils.join(fileNameList, ",") + "\"改为空" + ",");
                                         }
 
                                     }
                                 } else {
                                     if (fileNameListTemp.size() != 0) {
                                         if("1".equals(flag)){
-                                            sb.append(dbFieldTxt + " from null to " + StringUtils.join(fileNameListTemp, ",") + ",");
+                                            sb.append(dbFieldTxt + " from null to \"" + StringUtils.join(fileNameListTemp, ",") + "\",");
                                         }else{
-                                            sb.append(dbFieldTxt + "由空改为" + StringUtils.join(fileNameListTemp, ",") + ",");
+                                            sb.append(dbFieldTxt + "由空改为\"" + StringUtils.join(fileNameListTemp, ",") + "\",");
                                         }
 
                                     }
@@ -2988,23 +2988,23 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                     if (ObjectUtils.isNotEmpty(value)) {
                                         if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) {
                                             if("1".equals(flag)){
-                                                sb.append(dbFieldTxt +" from "+ value + " to " + valueTemp + ",");
+                                                sb.append(dbFieldTxt +" from \""+ value + "\" to \"" + valueTemp + "\",");
                                             }else{
-                                                sb.append(dbFieldTxt + "由" + value + "改为" + valueTemp + ",");
+                                                sb.append(dbFieldTxt + "由\"" + value + "\"改为\"" + valueTemp + "\",");
                                             }
                                         } else if (ObjectUtils.isEmpty(valueTemp)) {
                                             if("1".equals(flag)){
-                                                sb.append(dbFieldTxt + " from "+value + " to null " + ",");
+                                                sb.append(dbFieldTxt + " from \""+value + "\" to null " + ",");
                                             }else{
-                                                sb.append(dbFieldTxt + "由" + value + "改为空" + ",");
+                                                sb.append(dbFieldTxt + "由\"" + value + "\"改为空" + ",");
                                             }
                                         }
                                     } else {
                                         if (ObjectUtils.isNotEmpty(valueTemp)) {
                                             if("1".equals(flag)){
-                                                sb.append(dbFieldTxt + " from null to " + valueTemp + ",");
+                                                sb.append(dbFieldTxt + " from null to \"" + valueTemp + "\",");
                                             }else{
-                                                sb.append(dbFieldTxt + "由空改为" + valueTemp + ",");
+                                                sb.append(dbFieldTxt + "由空改为\"" + valueTemp + "\",");
                                             }
                                         }
                                     }
@@ -3203,9 +3203,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             try {
 //                String contentInfoFei = "In the " + technologyTerritoryNameEn + " technical field you subscribed to, the " +
 //                        category + " " + serialNumber+" has been updated.";
+                String contentInfoFei = "In the "+category + " " + serialNumber +" you subscribed to, "+sysUser.getUsername()+" changed the " + sbStr.toString();;
                 //跳转文档详情
                 String url = backUrl + "/docManage/library/detail?id=" + id;
-                iFeishuService.batchSendMessage(userIdListUpdateFeishu.toArray(new String[]{}), content, MessageTypeEnum.READ.getName(), url);
+                iFeishuService.batchSendMessage(userIdListUpdateFeishu.toArray(new String[]{}), contentInfoFei, MessageTypeEnum.READ.getName(), url);
+//                iFeishuService.batchSendMessage(userIdListUpdateFeishu.toArray(new String[]{}), content, MessageTypeEnum.READ.getName(), url);
             } catch (IOException e) {
                 log.error("文档新增飞书消息推送失败");
             }