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

合并分支 'master' 到 'dev_third_stage'

Browse Source 
Master

查看合并请求 laws-nio/laws-weilai!126
This commit is contained in:
李雪涛
2022-08-04 22:59:32 +08:00
parent a4b6ddeefe d75f0d2a94
commit 00d706de8d
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
+4
View File
@@ -53,3 +53,7 @@ ADD COLUMN `initiator` varchar(255) NULL COMMENT '发起人' AFTER `document_id`
-- 2022-07-05 修改字段类型 生产环境已同步 -- 2022-07-05 修改字段类型 生产环境已同步
ALTER TABLE `project_laws_inventory_log` ALTER TABLE `project_laws_inventory_log`
MODIFY COLUMN `log_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'log内容' AFTER `project_library_id`; MODIFY COLUMN `log_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'log内容' AFTER `project_library_id`;
-- 2022-08-04 修改字段类型 生产环境未同步
ALTER TABLE `dummy_inventory_info`
MODIFY COLUMN `subtitle` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子标题' AFTER `wvta_id`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+4 -4
View File
@@ -3630,8 +3630,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if (value.contains("%")) { if (value.contains("%")) {
value = value.replace("%", "/%"); value = value.replace("%", "/%");
} }
conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%') ESCAPE '/'"); // conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%') ESCAPE '/'");
// conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')"); conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')");
} else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType) } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType)
|| FieldTypeEnum.PULL_MORE.getValue().equals(fieldType) || FieldTypeEnum.PULL_MORE.getValue().equals(fieldType)
|| FieldTypeEnum.TREE.getValue().equals(fieldType)) { || FieldTypeEnum.TREE.getValue().equals(fieldType)) {
@@ -3659,8 +3659,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if (value.contains("%")) { if (value.contains("%")) {
value = value.replace("%", "/%"); value = value.replace("%", "/%");
} }
conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%') ESCAPE '/'"); // conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%') ESCAPE '/'");
// conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')"); conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')");
} }
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+3 -3
View File
@@ -1251,12 +1251,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
//子标题 //子标题
if(StringUtils.isNotBlank(subtitle)){ if(StringUtils.isNotBlank(subtitle)){
if(subtitle.length() > 100){ if(subtitle.length() > 300){
String message = ""; String message = "";
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){
message = errorMsg + "子标题不能超过100个字符, "; message = errorMsg + "子标题不能超过300个字符, ";
}else{ }else{
message = errorMsg + " Subheadings cannot be checked more than 100 characters, "; message = errorMsg + " Subheadings cannot be checked more than 300 characters, ";
} }
msgList.add(message); msgList.add(message);
} }