test(system): 修复菜单保存和通知查询问题
- 在 MenuServiceImplTest 中添加了 role 菜单的保存操作 - 优化了 UserNoticeMapper.xml 中的通知查询 SQL 语句,调整了 GROUP BY 的位置
This commit is contained in:
parent
05a76348f1
commit
6e9e674a91
@ -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
|
||||
<where>
|
||||
<if test="query.userId != null">
|
||||
AND sun.user_id = #{query.userId}
|
||||
@ -103,6 +101,8 @@
|
||||
AND sn.create_time BETWEEN #{query.createAtBegin} AND #{query.createAtEnd}
|
||||
</if>
|
||||
</where>
|
||||
GROUP BY
|
||||
sn.id
|
||||
</select>
|
||||
|
||||
</mapper>
|
@ -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", "");
|
||||
|
Loading…
Reference in New Issue
Block a user