fys/fys-Multi-tenant
0
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

查询所有设备类型

Browse Source
This commit is contained in:
daiyongfei
2025-09-22 16:34:32 +08:00
parent 9d642f4913
commit 5b3a92c80d
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java
View File

@ -98,18 +98,35 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
public List<DeviceType> queryDeviceTypes() { public List<DeviceType> queryDeviceTypes() {
DeviceTypeQueryCriteria criteria = new DeviceTypeQueryCriteria(); DeviceTypeQueryCriteria criteria = new DeviceTypeQueryCriteria();
// 管理员 // // 管理员
String username = LoginHelper.getUsername(); // String username = LoginHelper.getUsername();
if (!username.equals("admin")) { // if (!username.equals("admin")) {
criteria.setCustomerId(LoginHelper.getUserId()); // criteria.setCustomerId(LoginHelper.getUserId());
//
// Long userId = LoginHelper.getUserId();
// criteria.setCustomerId(userId);
// }
// 角色管理员
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
criteria.setCustomerId(userId); List<SysRoleVo> roles = roleService.selectRolesAuthByUserId(userId);
boolean isAdmin = false;
if (CollectionUtil.isNotEmpty(roles)) {
for (SysRoleVo role : roles) {
if (role.getRoleKey().contains("admin")) {
isAdmin = true;
break;
}
}
}
if (!isAdmin) {
criteria.setCustomerId(LoginHelper.getUserId());
} }
return deviceTypeMapper.findAll(criteria); return deviceTypeMapper.findAll(criteria);
} }
/** /**
* 根据设备类型名称查询设备类型 * 根据设备类型名称查询设备类型
* *