From 0bf5153f00e6fc1722454a6c6d39025f58471f20 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 7 Apr 2022 09:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=9D=A1=E6=AC=BE-=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FileSplitItemsEOServiceImpl.java     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index c88bbfe0d..52a80e951 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -672,14 +672,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     conditionSb.append(" and sar_file_split_items." + key + " in('" + menuIds + "')");
                 }
             } else if (!"pageNo".equals(key) && !"pageSize".equals(key)) {
-                String value = (String) entry.getValue();
-                if (StringUtils.isNotBlank(value)) {
+                if (ObjectUtil.isNotEmpty(entry.getValue())) {
                     for (Map<String, Object> map : mapList) {
                         String fieldName = (String) map.get("db_field_name");//字段
                         if (key.equals(fieldName)) {
                             //字段类型(判断是输入框还是下拉,等等)
                             String fieldType = (String) map.get("field_show_type");//字段类型
-                            if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldType)) {
+                            if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldType) || FieldTypeEnum.TEXT_LINK.getValue().equals(fieldType)) {
+                                String value = (String) entry.getValue();
                                 //输入框  LIKE CONCAT("%", '/%', "%")  ESCAPE '/'
                                 if(value.contains("%")){
                                     value = value.replace("%", "/%");
@@ -689,23 +689,29 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType)
                                     || FieldTypeEnum.PULL_MORE.getValue().equals(fieldType)
                                     || FieldTypeEnum.TREE.getValue().equals(fieldType)) {
+                                String value = (String) entry.getValue();
                                 StringBuilder valueSb = new StringBuilder();
                                 StringBuilder condition = new StringBuilder();
                                 for (String valueTemp : value.split(",")) {
                                     valueSb.append("'" + valueTemp + "',");
-                                    condition.append(" or sar_file_split_items." + key + " like concat(concat('%','" + valueTemp + "'),'%'))");
+                                    condition.append(" or sar_file_split_items." + key + " like concat(concat('%','" + valueTemp + "'),'%')");
                                 }
+                                condition.append(")");
                                 String substring = valueSb.substring(0, valueSb.length() - 1);
                                 //下拉单选或下拉多选
                                 conditionSb.append(" and (sar_file_split_items." + key + " in(" + substring + ")" + condition.toString());
                             } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldType)) {
+                                String value = (String) entry.getValue();
                                 //日期(区分单日期还时间范围)
                                 if (value.contains(",")) {
-                                    conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') >= '" + value.split(",")[0] + "'"
-                                            + " and " + "date_format(" + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'");
+                                    conditionSb.append(" and " + "date_format(sar_file_split_items." + key + ",'%Y-%m-%d') >= '" + value.split(",")[0] + "'"
+                                            + " and " + "date_format(sar_file_split_items." + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'");
                                 } else {
-                                    conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') = '" + value + "'");
+                                    conditionSb.append(" and " + "date_format(sar_file_split_items." + key + ",'%Y-%m-%d') = '" + value + "'");
                                 }
+                            } else if (FieldTypeEnum.TEXT_NUMBER.getValue().equals(fieldType)) {
+                                Double value = Double.valueOf(entry.getValue().toString());
+                                conditionSb.append(" and sar_file_split_items." + key + " =" + value);
                             }
                         }
                     }