fix(platform): repair message detail views
Some checks failed
ci / build-test-parity (push) Has been cancelled
Some checks failed
ci / build-test-parity (push) Has been cancelled
This commit is contained in:
@@ -172,7 +172,7 @@ public class NoticeController {
|
||||
+ " " + messageDetailColumns()
|
||||
+ " FROM eip3.sys_messageuser mu"
|
||||
+ " JOIN eip3.sys_message m ON m.sys_message_id = mu.sys_message_id"
|
||||
+ " LEFT JOIN view_sys_user u ON u.view_sys_user_id = m.createby"
|
||||
+ " LEFT JOIN eip3.view_sys_user u ON u.view_sys_user_id = m.createby"
|
||||
+ " WHERE mu.sys_messageuser_id = CAST(? AS character(36))"
|
||||
+ " AND mu.sys_user_id = CAST(? AS character(36))"
|
||||
+ " AND mu.isdel = 0"
|
||||
@@ -344,7 +344,7 @@ public class NoticeController {
|
||||
private static String messageDetailSelect() {
|
||||
return "SELECT " + messageDetailColumns()
|
||||
+ " FROM eip3.sys_message m"
|
||||
+ " LEFT JOIN view_sys_user u ON u.view_sys_user_id = m.createby";
|
||||
+ " LEFT JOIN eip3.view_sys_user u ON u.view_sys_user_id = m.createby";
|
||||
}
|
||||
|
||||
private static String messageDetailColumns() {
|
||||
@@ -355,9 +355,16 @@ public class NoticeController {
|
||||
+ " m.createtime,"
|
||||
+ " TRIM(m.createby) AS sender_id,"
|
||||
+ " COALESCE(NULLIF(TRIM(u.displayname), ''), TRIM(m.createby)) AS sender,"
|
||||
+ " m.tousersname AS receivers,"
|
||||
+ " m.tousers AS receiver_ids,"
|
||||
+ " m.document AS document,"
|
||||
+ " (SELECT string_agg(COALESCE(NULLIF(TRIM(ru.displayname), ''), TRIM(mu2.sys_user_id)), ', ')"
|
||||
+ " FROM eip3.sys_messageuser mu2"
|
||||
+ " LEFT JOIN eip3.view_sys_user ru ON ru.view_sys_user_id = mu2.sys_user_id"
|
||||
+ " WHERE mu2.sys_message_id = m.sys_message_id"
|
||||
+ " AND mu2.isdel = 0) AS receivers,"
|
||||
+ " (SELECT string_agg(TRIM(mu2.sys_user_id), ',')"
|
||||
+ " FROM eip3.sys_messageuser mu2"
|
||||
+ " WHERE mu2.sys_message_id = m.sys_message_id"
|
||||
+ " AND mu2.isdel = 0) AS receiver_ids,"
|
||||
+ " NULL::text AS document,"
|
||||
+ " m.params AS params";
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package com.eip4.platform.metadata.web;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
@@ -19,6 +21,7 @@ import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.MockedStatic;
|
||||
import org.springframework.dao.EmptyResultDataAccessException;
|
||||
import org.springframework.http.HttpStatus;
|
||||
@@ -178,6 +181,15 @@ class NoticeControllerTest {
|
||||
assertEquals("张三[001]", data.get("sender"));
|
||||
assertEquals(false, data.get("received"));
|
||||
assertEquals(false, data.get("readChanged"));
|
||||
|
||||
ArgumentCaptor<String> sql = ArgumentCaptor.forClass(String.class);
|
||||
verify(jdbc).queryForMap(sql.capture(), eq("msg-011"), eq("user-008"), eq("user-008"));
|
||||
assertTrue(sql.getValue().contains("eip3.sys_messageuser"),
|
||||
"详情 SQL 应通过 sys_messageuser 聚合收件人");
|
||||
assertFalse(sql.getValue().contains("m.tousers"),
|
||||
"真实 sys_message 表没有 tousers/tousersname 字段");
|
||||
assertFalse(sql.getValue().contains("m.document"),
|
||||
"真实 sys_message 表没有 document 字段");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user