查询修改

src/main/java/com/neotel/smfcore/common/utils/QueryHelp.java

@@ -123,7 +123,9 @@ public class QueryHelp {
                 log.error(e.getMessage(), e);
             }
         }
-
+        if(allCriteria.size()<=0){
+            return new Query();
+        }
         return new Query(new Criteria().andOperator(allCriteria));
     }
 

src/main/java/com/neotel/smfcore/security/rest/RoleController.java

@@ -68,8 +68,8 @@ public class RoleController {
     @PreAuthorize("@el.check('roles:list','user:add','user:edit')")
     public ResponseEntity<Object> query(){
         Query query=new Query();
-        query.with(Sort.by(Sort.Direction.ASC,"levle"));
-        return new ResponseEntity<>(roleManager.findByQuery(query),HttpStatus.OK);
+//        query.with(Sort.by(Sort.Direction.ASC,"levle"));
+        return new ResponseEntity<>(roleMapper.toDto(roleManager.findByQuery(query)) ,HttpStatus.OK);
     }
 
     @ApiOperation("查询角色")
@@ -77,7 +77,7 @@ public class RoleController {
     @PreAuthorize("@el.check('roles:list')")
     public ResponseEntity<Object> query(RoleQueryCriteria criteria, Pageable pageable){
         Query query= QueryHelp.getQuery(criteria);
-        query.with(Sort.by(Sort.Direction.ASC,"level"));
+//        query.with(Sort.by(Sort.Direction.ASC,"id"));
         List<Role> roles=roleManager.findByPage(query,pageable);
         List<RoleDto> dtos=roleMapper.toDto(roles);
         Map<String ,Object> data= PageUtil.toPage(dtos,dtos.size());