From 6e9e674a91389ab265708ea7589f82cd1615d7ad Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Thu, 16 Jan 2025 17:11:14 +0800 Subject: [PATCH] =?UTF-8?q?test(system):=20=E4=BF=AE=E5=A4=8D=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E4=BF=9D=E5=AD=98=E5=92=8C=E9=80=9A=E7=9F=A5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 MenuServiceImplTest 中添加了 role 菜单的保存操作 - 优化了 UserNoticeMapper.xml 中的通知查询 SQL 语句，调整了 GROUP BY 的位置 --- src/main/resources/mappers/notice/UserNoticeMapper.xml | 4 ++-- .../modules/system/service/impl/MenuServiceImplTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mappers/notice/UserNoticeMapper.xml b/src/main/resources/mappers/notice/UserNoticeMapper.xml index a22a6e7..1d634f3 100644 --- a/src/main/resources/mappers/notice/UserNoticeMapper.xml +++ b/src/main/resources/mappers/notice/UserNoticeMapper.xml @@ -90,8 +90,6 @@ sys_user su ON sun.user_id = su.id LEFT JOIN sys_notice sn ON sn.id = sun.notice_id - GROUP BY - sn.id AND sun.user_id = #{query.userId} @@ -103,6 +101,8 @@ AND sn.create_time BETWEEN #{query.createAtBegin} AND #{query.createAtEnd} + GROUP BY + sn.id \ No newline at end of file diff --git a/src/test/java/com/zsc/edu/gateway/modules/system/service/impl/MenuServiceImplTest.java b/src/test/java/com/zsc/edu/gateway/modules/system/service/impl/MenuServiceImplTest.java index 0623217..ff66442 100644 --- a/src/test/java/com/zsc/edu/gateway/modules/system/service/impl/MenuServiceImplTest.java +++ b/src/test/java/com/zsc/edu/gateway/modules/system/service/impl/MenuServiceImplTest.java @@ -44,7 +44,7 @@ class MenuServiceImplTest { Menu device = new Menu(iot.getId(), Menu.Type.PAGE, "Device", "device", "设备管理", null, true, false, 1, "iot:device", ""); Menu product = new Menu(iot.getId(), Menu.Type.PAGE, "Product", "product", "产品管理", null, true, false, 2, "iot:product", ""); Menu tsl = new Menu(product.getId(), Menu.Type.PAGE, "Tsl", "tsl", "物模型管理", null, true, true, 3, "iot:tsl", ""); - menuService.saveBatch(List.of(workplace, dept, users, authority, menu, notice, bulletin, device, product, tsl)); + menuService.saveBatch(List.of(workplace, dept, users, authority, menu, notice, bulletin, device, product, tsl, role)); Menu roleCreate = new Menu(role.getId(), Menu.Type.OPERATION, "roleCreate", null, "角色新增", null, true, false, 1, "system:role:create", ""); Menu roleDelete = new Menu(role.getId(), Menu.Type.OPERATION, "roleDelete", null, "角色删除", null, true, false, 1, "system:role:delete", ""); Menu roleUpdate = new Menu(role.getId(), Menu.Type.OPERATION, "roleUpdate", null, "角色修改", null, true, false, 1, "system:role:update", "");