From dca48af888cdd0fbff22b4f5d2408ba931021543 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 9 Jan 2023 17:04:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=8A=A8=E6=80=81--?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 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 e8d3f59f2..3d958f539 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
@@ -2718,13 +2718,22 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         String contentFile = "";
         String contentInfoFile = "";
         if(StringUtils.isNotBlank(sbField)){
-//            String substring = sbField.substring(0, sbField.length() - 1);
-            contentFile = category + " " + serialNumber + " " + titleEn + " uploaded " + sbField;
-        }
-        if(StringUtils.isNotBlank(sbNew)){
-//            String substring = sbNew.substring(0, sbNew.length() - 1);
-            contentInfoFile = category + " " + href + " uploaded " + sbNew;
+            String substring = sbField.substring(0,sbField.length() - 1);
+            String sbFieldReplace = substring.toString().replaceAll(",", "、");
+            if(StringUtils.isBlank(category)){
+                contentFile = sbFieldReplace +" "+ serialNumber + " " + titleEn + " has been uploaded.";
+                contentInfoFile = sbFieldReplace +" "+ href + " " + " has been uploaded.";
+            }else{
+                contentFile = sbFieldReplace + " "+category + " " + serialNumber + " " + titleEn + " has been uploaded.";
+                contentInfoFile = sbFieldReplace+" "+category + " " + href + " " + " has been uploaded.";
+            }
         }
+//        if(StringUtils.isNotBlank(sbField)){
+////            contentInfoFile = category + " " + href + " uploaded " + sbNew;
+//        }
+//        if(StringUtils.isNotBlank(sbNew)){
+//            contentInfoFile = category + " " + href + " uploaded " + sbNew;
+//        }
 
         //编辑时处理首页文档动态  1. 标准XXXX的状态改为  2. 标准XXXX的适用车型改为   3. 标准XXXX删除了XXXX文件  4. 标准XXXX上传了XXXX文件
 //        String href = "<a href='/docManage/library/detail?id=" + id +

From 19e8a632e3a619e04fc72d5473d26e63509a983e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 9 Jan 2023 21:40:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=85=8D=E7=BD=AE=20viewer=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E9=A2=86=E5=9F=9F=E9=85=8D=E7=BD=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/system/modules/RoleAssignment.vue | 2 +-
 jero-web/src/views/system/modules/UserModal.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/system/modules/RoleAssignment.vue b/jero-web/src/views/system/modules/RoleAssignment.vue
index b3df1eeb6..83f7eabad 100644
--- a/jero-web/src/views/system/modules/RoleAssignment.vue
+++ b/jero-web/src/views/system/modules/RoleAssignment.vue
@@ -157,7 +157,7 @@ export default {
             // 当不是取消全选操作，只要数组中出现了0则说明进行了全选操作
             list = []
             for (let i in modelList) {
-              list.push(modelList[i].title)
+              list.push(modelList[i].value)
               // 全选时，也需要给jobsStr 赋值，拿到所有的下拉选项，并进行数据格式转换
               this.jobsStr = list.join(',')
             }
diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index 7bfb5e8db..eb9a4c3e5 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -542,7 +542,7 @@
               // 当不是取消全选操作，只要数组中出现了0则说明进行了全选操作
               list = []
               for (let i in modelList) {
-                list.push(modelList[i].title)
+                list.push(modelList[i].value)
                 // 全选时，也需要给jobsStr 赋值，拿到所有的下拉选项，并进行数据格式转换
                 this.jobsStr = list.join(',')
               }