|
@@ -550,6 +550,17 @@ public class DeviceInfoController {
|
|
if (StringUtils.isNotEmpty(aliasName)) {
|
|
if (StringUtils.isNotEmpty(aliasName)) {
|
|
searchParams.put("aliasName", "%" + aliasName + "%");
|
|
searchParams.put("aliasName", "%" + aliasName + "%");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ //为公司管理员
|
|
|
|
+ boolean is_admin = userService.hasRole(subject,"ADMIN");
|
|
|
|
+ if(is_admin){
|
|
|
|
+ User user = userService.get(subject);
|
|
|
|
+ String companyId = user.getCompanyId();
|
|
|
|
+ searchParams.put("bindCompanyId", companyId);
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
List<DeviceInfo> deviceList = deviceInfoService.pageSearch(searchParams,1, limit,false, sortList);
|
|
List<DeviceInfo> deviceList = deviceInfoService.pageSearch(searchParams,1, limit,false, sortList);
|
|
|
|
|
|
msgResult.setResult(true);
|
|
msgResult.setResult(true);
|