luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、修改灌溉记录和刷卡记录bug

Browse Source 
2、修改设备信息bug
This commit is contained in:
wyw
2024-08-15 23:50:40 +08:00
parent efafc02865
commit 52f9a1c382
4 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceController.java
View File

@ -166,19 +166,19 @@ public class DeviceController extends BaseController {
public AjaxResult getInfo(@PathVariable("deviceId") Long deviceId) {
Device device = deviceService.selectDeviceByDeviceId(deviceId);
// 判断当前用户是否有设备分享权限 （设备所属机构管理员和设备所属用户有权限）
LoginUser loginUser = getLoginUser();
List<SysRole> roles = loginUser.getUser().getRoles();
//判断当前用户是否为设备所属机构管理员
if (roles.stream().anyMatch(a -> "admin".equals(a.getRoleKey()))) {
device.setIsOwner(1);
} else {
//判断当前用户是否是设备所属用户
if (Objects.equals(device.getTenantId(), loginUser.getUserId())) {
device.setIsOwner(1);
} else {
device.setIsOwner(0);
}
}
// LoginUser loginUser = getLoginUser();
// List<SysRole> roles = loginUser.getUser().getRoles();
// //判断当前用户是否为设备所属机构管理员
// if (roles.stream().anyMatch(a -> "admin".equals(a.getRoleKey()))) {
// device.setIsOwner(1);
// } else {
// //判断当前用户是否是设备所属用户
// if (Objects.equals(device.getTenantId(), loginUser.getUserId())) {
// device.setIsOwner(1);
// } else {
// device.setIsOwner(0);
// }
// }
return AjaxResult.success(device);
}