From c3927bac94d25a6bc0f02d2b9e14e62e01201ae3 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Wed, 27 Sep 2023 15:42:55 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml  | 1 +
 .../laws/common/service/impl/LawsCommonServiceImpl.java       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
index de6e8907..21def785 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
@@ -59,6 +59,7 @@
         <if test="vo.nodeCode != null and vo.nodeCode != ''">
             AND id not in (select unique_relation_flag from laws_node_relation where node_code = #{vo.nodeCode})
         </if>
+        ORDER BY create_time DESC
     </select>
     <select id="getSingleStandard" resultType="com.jero.modules.laws.common.vo.ManyStandardSelectionBox">
         SELECT id, standard_number, standard_name, release_date, standard_state
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index 043ada1d..16c3bca2 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -1720,7 +1720,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
             String key = entryMap.getKey();
             String value = "";
             if (!Objects.isNull(entryMap.getValue())) {
-                value = entryMap.getValue().toString();
+                value = (String) entryMap.getValue();
             }
             // 如果value不为null和""，则拼接查询条件
             if (StringUtils.isNotBlank(value)) {
@@ -1844,7 +1844,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         StringBuilder condition = new StringBuilder();
         for (String valueTemp : value.split(",")) {
             valueSb.append("'").append(valueTemp).append("',");
-            condition.append(" or ").append(key).append(" like binary concat(concat('%','").append(valueTemp).append("'),'%')");
+            condition.append(" or ").append(key).append(" like concat(concat('%','").append(valueTemp).append("'),'%')");
         }
         condition.append(")");
         String substring = valueSb.substring(0, valueSb.length() - 1);