From 08dc5f12f0362765e8ce4f094a3ab798b1a0e56c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 4 Aug 2022 18:09:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5--=E5=AD=90=E6=A0=87=E9=A2=98=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E9=99=90=E5=88=B6300?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/first_bug_fix_record.sql           | 4 ++++
 .../dummy/service/impl/DummyInventoryInfoEOServiceImpl.java | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
index 3aedad2d8..38a22e334 100644
--- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
+++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
@@ -53,3 +53,7 @@ ADD COLUMN `initiator` varchar(255) NULL COMMENT '发起人' AFTER `document_id`
 -- 2022-07-05 修改字段类型  生产环境已同步
 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`;
+
+-- 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`;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index 2faae8a76..7d5fa5e92 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -1251,12 +1251,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 
 			//子标题
 			if(StringUtils.isNotBlank(subtitle)){
-				if(subtitle.length() > 100){
+				if(subtitle.length() > 300){
 					String message = "";
 					if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){
-						message = errorMsg + "子标题不能超过100个字符, ";
+						message = errorMsg + "子标题不能超过300个字符, ";
 					}else{
-						message = errorMsg + " Subheadings cannot be checked more than 100 characters, ";
+						message = errorMsg + " Subheadings cannot be checked more than 300 characters, ";
 					}
 					msgList.add(message);
 				}

From 5308f391f7aa4729562d81c9a6565fa565f7a95e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 4 Aug 2022 18:23:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 7d48f7722..89a09fc42 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
@@ -3630,8 +3630,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 if (value.contains("%")) {
                                     value = value.replace("%", "/%");
                                 }
-                                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 + "'),'%') ESCAPE '/'");
+                                conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')");
                             } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType)
                                     || FieldTypeEnum.PULL_MORE.getValue().equals(fieldType)
                                     || FieldTypeEnum.TREE.getValue().equals(fieldType)) {
@@ -3659,8 +3659,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 if (value.contains("%")) {
                                     value = value.replace("%", "/%");
                                 }
-                                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 + "'),'%') ESCAPE '/'");
+                                conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')");
                             }
                         }
                     }