|
@@ -339,11 +339,12 @@ public class DeviceInfoController {
|
|
|
Map<String,Object> searchParams = new HashMap<>();
|
|
|
|
|
|
List<Sort> sortList = new ArrayList<>();
|
|
|
+ sortList.add(new Sort("a.is_online","desc"));
|
|
|
sortList.add(new Sort("a.create_time","desc"));
|
|
|
|
|
|
//为公司管理员
|
|
|
boolean is_admin = userService.hasRole(subject,"ADMIN");
|
|
|
- if(is_admin){
|
|
|
+ if (is_admin){
|
|
|
User user = userService.get(subject);
|
|
|
String userCompanyId = user.getCompanyId();
|
|
|
|