From afaadcfef9aa4213533d2055e77ce2a69fe087f1 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 23 十一月 2022 14:01:02 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/resources/mapper/TransactionEventMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
index cbf0785..f4028fd 100644
--- a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
+++ b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -465,7 +465,7 @@
</select>
<select id="selectSearchList" resultType="com.dg.core.db.manual.pojo.Search">
- select distinct classify_id, type,parentClassifyId from ( select id,matter_name title,concat((select classify_name from automessage_classify_administration
+ select distinct classify_id, content,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 parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id) parentClassifyId,
--
Gitblit v1.7.1