From f9e06198cfbccf337b53c0fa6cb3404455ceb0ba Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 09 九月 2023 09:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/OpinionMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/OpinionMapper.xml b/inspect-server/src/main/resources/mapper/OpinionMapper.xml
index 8221360..e9c22ca 100644
--- a/inspect-server/src/main/resources/mapper/OpinionMapper.xml
+++ b/inspect-server/src/main/resources/mapper/OpinionMapper.xml
@@ -2,11 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.OpinionMapper">
- <select id="clickEditingTriggerQuery" resultType="map">
- SELECT o.`id`, o.`tell`, o.`type`, o.`way`, o.`fill_date`
+ <select id="clickEditingTriggerQuery" resultType="updateInspectUnacceptedDto">
+ SELECT o.`id`, o.`tell`, o.`type`, o.`way`
FROM opinion o
LEFT JOIN `user` u ON o.`user_id` = u.`id`
WHERE o.`raw_unaccepted_id` = #{rawUnacceptedId}
+ ORDER BY o.`type`
</select>
<update id="updateOpinion" parameterType="integer">
@@ -44,5 +45,6 @@
FROM opinion o
LEFT JOIN `user` u ON o.`user_id` = u.`id`
WHERE o.raw_unaccepted_id = #{rawUnacceptedId}
+ ORDER BY o.type
</select>
</mapper>
--
Gitblit v1.9.3