WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'fix_2nd_20230103' 到 'master'

Browse Source 
Fix 2nd 20230103

查看合并请求 laws-nio/laws-weilai!276
This commit is contained in:
高嵩
2023-01-09 21:41:25 +08:00
parent d3d9e8eb2b 19e8a632e3
commit 5dc21849c2
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+15 -6
View File
@@ -2718,13 +2718,22 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String contentFile = ""; String contentFile = "";
String contentInfoFile = ""; String contentInfoFile = "";
if(StringUtils.isNotBlank(sbField)){ if(StringUtils.isNotBlank(sbField)){
// String substring = sbField.substring(0, sbField.length() - 1); String substring = sbField.substring(0,sbField.length() - 1);
contentFile = category + " " + serialNumber + " " + titleEn + " uploaded " + sbField; String sbFieldReplace = substring.toString().replaceAll(",", "、");
} if(StringUtils.isBlank(category)){
if(StringUtils.isNotBlank(sbNew)){ contentFile = sbFieldReplace +" "+ serialNumber + " " + titleEn + " has been uploaded.";
// String substring = sbNew.substring(0, sbNew.length() - 1); contentInfoFile = sbFieldReplace +" "+ href + " " + " has been uploaded.";
contentInfoFile = category + " " + href + " uploaded " + sbNew; }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文件 //编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件
// String href = "<a href='/docManage/library/detail?id=" + id + // String href = "<a href='/docManage/library/detail?id=" + id +
jero-web/src/views/system/modules/RoleAssignment.vue
+1 -1
View File
@@ -157,7 +157,7 @@ export default {
// 当不是取消全选操作，只要数组中出现了0则说明进行了全选操作 // 当不是取消全选操作，只要数组中出现了0则说明进行了全选操作
list = [] list = []
for (let i in modelList) { for (let i in modelList) {
list.push(modelList[i].title) list.push(modelList[i].value)
// 全选时，也需要给jobsStr 赋值，拿到所有的下拉选项，并进行数据格式转换 // 全选时，也需要给jobsStr 赋值，拿到所有的下拉选项，并进行数据格式转换
this.jobsStr = list.join(',') this.jobsStr = list.join(',')
} }
jero-web/src/views/system/modules/UserModal.vue
+1 -1
View File
@@ -542,7 +542,7 @@
// 当不是取消全选操作，只要数组中出现了0则说明进行了全选操作 // 当不是取消全选操作，只要数组中出现了0则说明进行了全选操作
list = [] list = []
for (let i in modelList) { for (let i in modelList) {
list.push(modelList[i].title) list.push(modelList[i].value)
// 全选时，也需要给jobsStr 赋值，拿到所有的下拉选项，并进行数据格式转换 // 全选时，也需要给jobsStr 赋值，拿到所有的下拉选项，并进行数据格式转换
this.jobsStr = list.join(',') this.jobsStr = list.join(',')
} }