|
@@ -116,6 +116,13 @@ public class AlarmSettingController {
|
|
alarmSettingDto.setAttributeName(attributeName);
|
|
alarmSettingDto.setAttributeName(attributeName);
|
|
alarmSettingDto.setSceneId(sceneId);
|
|
alarmSettingDto.setSceneId(sceneId);
|
|
alarmSettingDto.setSceneIds(sceneService.findByParentIdsLike(sceneId));
|
|
alarmSettingDto.setSceneIds(sceneService.findByParentIdsLike(sceneId));
|
|
|
|
+ LoginUser loginUser = UserUtil.getCurrentUser();
|
|
|
|
+ alarmSettingDto.setTenantId(loginUser.getTenantId());
|
|
|
|
+ alarmSettingDto.setProgramItems(loginUser.getProgramItemList());
|
|
|
|
+ alarmSettingDto.setUserType(loginUser.getType());
|
|
|
|
+ //1是公司,2是公司及以下,3部门,4部门及以下,5自定义
|
|
|
|
+ alarmSettingDto.setPermissonType(loginUser.getPermissonType());
|
|
|
|
+
|
|
IPage<AlarmSettingDto> iPage = new Page<>(pageNum, pageSize);
|
|
IPage<AlarmSettingDto> iPage = new Page<>(pageNum, pageSize);
|
|
iPage = alarmSettingService.selectPage(iPage, alarmSettingDto);
|
|
iPage = alarmSettingService.selectPage(iPage, alarmSettingDto);
|
|
Pagination<AlarmSettingDto> pages = new Pagination<>(iPage);
|
|
Pagination<AlarmSettingDto> pages = new Pagination<>(iPage);
|