machunlei/springboot-xinda-dev
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Changes提交修改

Browse Source
This commit is contained in:
15666619788
2025-07-27 22:23:59 +08:00
parent a9895296f0
commit 34d3a965d7
35 changed files with 894 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xinda-admin/src/main/java/com/xinda/web/controller/system/SysLoginController.java
View File

@@ -101,11 +101,13 @@ public class SysLoginController
Set<String> roles = permissionService.getRolePermission(user);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(user);
Set<String> fpermissions = permissionService.getMenuPermissionF(user);
AppPreferences appPreferences = appPreferencesService.selectAppPreferencesByUserId(user.getUserId());
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
ajax.put("fpermissions", fpermissions);
ajax.put("mqtt",enabled);
ajax.put("language", appPreferences.getLanguage());
return ajax;

2
xinda-admin/src/main/java/com/xinda/web/controller/system/SysNoticeController.java
View File

@@ -55,7 +55,7 @@ public class SysNoticeController extends BaseController
{
notice.setDeptId(getDeptId());
startPage();
List<SysNotice> list = noticeService.selectNoticeList(notice);
List<SysNotice> list = noticeService.selectNoticeIndexList(notice);
return getDataTable(list);
}