Commit 82367bfec881f3c3f4c9cf60d2824bb11f90f62d
1 parent
0ed6953226
Exists in
master
and in
1 other branch
bug fix
Showing 1 changed file with 8 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
View file @
82367bf
... | ... | @@ -79,7 +79,7 @@ |
79 | 79 | |
80 | 80 | UsersQuery usersQuery = new UsersQuery(); |
81 | 81 | usersQuery.setNeed("true"); |
82 | - usersQuery.setSort("id desc"); | |
82 | + usersQuery.setSort("modified desc"); | |
83 | 83 | usersQuery.setYn(YnEnums.YES.getId()); |
84 | 84 | usersQuery.setKeyword(keyword); |
85 | 85 | usersQuery.setType(0); |
... | ... | @@ -159,7 +159,7 @@ |
159 | 159 | page = page == null ? 1 : page; |
160 | 160 | |
161 | 161 | usersQuery.setNeed("true"); |
162 | - usersQuery.setSort("id desc"); | |
162 | + usersQuery.setSort("modified desc"); | |
163 | 163 | usersQuery.setYn(YnEnums.YES.getId()); |
164 | 164 | usersQuery.setDeptId(deptId); |
165 | 165 | usersQuery.setKeyword(keyword); |
... | ... | @@ -809,6 +809,12 @@ |
809 | 809 | @RequestParam(value = "roleIds",required = false) String roleIds, |
810 | 810 | @RequestParam(value = "orgId",required = false) Integer orgId, |
811 | 811 | @RequestParam(value = "deptId",required = false) Integer deptId) { |
812 | + | |
813 | + if(null == roleIds) { | |
814 | + ResultUtils.buildParameterErrorResultAndWrite(response, "roleIds不能为空"); | |
815 | + return; | |
816 | + } | |
817 | + | |
812 | 818 | //获取登录用户 |
813 | 819 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
814 | 820 | Users user = usersService.getUsers(loginState.getId()); |