From 8eca18fd0d9f96e56e2262b31dade4f729b7d1f7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 07 十一月 2022 14:57:56 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java | 3 +++
flower_city/src/main/resources/mapper/TransactionEventMapper.xml | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java b/flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java
index 5d09ade..b9d0e12 100644
--- a/flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java
+++ b/flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java
@@ -26,6 +26,9 @@
@ApiModelProperty("分类id")
private Integer classifyId;
+ @ApiModelProperty("分类id父id")
+ private Integer parentClassifyId;
+
@ApiModelProperty("搜索数据类型1.办事部门2.办事指南 3.推荐办事指南4.分类")
private Integer type;
diff --git a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
index 96ac1de..a122def 100644
--- a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
+++ b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -441,9 +441,10 @@
</select>
<select id="selectSearchList" resultType="com.dg.core.db.manual.pojo.Search">
- select id, title, content,classify_id, type from ( select id,matter_name title,concat((select classify_name from automessage_classify_administration
+ select id, title, content,classify_id, type,parentClassifyId from ( select id,matter_name title,concat((select classify_name from automessage_classify_administration
where id=(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id)),
- '/',(select classify_name from automessage_classify_administration where id=automessage_transaction_event.classify_id)) content,classify_id,
+ '/',(select classify_name from automessage_classify_administration where id=automessage_transaction_event.classify_id)) content,
+ classify_id,(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id) parentClassifyId,
2 type from automessage_transaction_event) k
where k.title like concat('%',#{keyWord}, '%') or k.content like concat('%',#{keyWord}, '%')
</select>
--
Gitblit v1.7.1