From 0f2be5010c93f9e7ea97cf1c37b0a774d2bedd6a Mon Sep 17 00:00:00 2001
From: caozhen <18736171426@139.com>
Date: Thu, 21 Sep 2023 16:52:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E9=A2=98/=E5=8A=A8=E6=80=81=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=EF=BC=88=E7=BC=96=E5=8F=B7+=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=EF=BC=89=E5=AD=97=E6=AE=B5=E5=90=8D=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/personal/entity/LawsStandardSharing.java   | 2 +-
 .../service/impl/LawsStandardSharingServiceImpl.java        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java
index 6411f539..af8a76b0 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java
@@ -119,5 +119,5 @@ public class LawsStandardSharing implements Serializable {
     private String delFlag;
 
     @ApiModelProperty(value = "标题/动态标题（编号+名称）")
-    private String title;
+    private String rubric;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java
index 0dd62e89..578f042a 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java
@@ -46,8 +46,8 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl<LawsStandardShar
         wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getStandardId()), LawsStandardSharing::getSharerId, sysUser.getId());
         wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getRecipientId()), LawsStandardSharing::getRecipientId, sysUser.getId());
         wrapper.eq(LawsStandardSharing::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
-        if (StringUtils.isNotBlank(lawsStandardSharing.getTitle())){
-            wrapper.last(" AND (standard_number LIKE " + "'%" + lawsStandardSharing.getTitle() + "%'" + " OR standard_name LIKE  " + "'%" + lawsStandardSharing.getTitle() + "%'" + ")");
+        if (StringUtils.isNotBlank(lawsStandardSharing.getRubric())){
+            wrapper.last(" AND (standard_number LIKE " + "'%" + lawsStandardSharing.getRubric() + "%'" + " OR standard_name LIKE  " + "'%" + lawsStandardSharing.getRubric() + "%'" + ")");
         }
         wrapper.orderByDesc(LawsStandardSharing::getSharingTime);
         Page<LawsStandardSharing> page = new Page<>(pageNo, pageSize);
@@ -63,7 +63,7 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl<LawsStandardShar
             }
             String standardNum = record.getStandardNumber();
             String standardName = record.getStandardName();
-            record.setTitle(standardName + "（" + standardNum + "）");
+            record.setRubric(standardName + "（" + standardNum + "）");
         }
     }