Commit 33b9865bac3e9a9cf405c0b2744cc07dfa365424
1 parent
469326f4c8
Exists in
master
and in
8 other branches
platform permission
角色添加 是否已经存在
Showing 2 changed files with 4 additions and 2 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java
View file @
33b9865
... | ... | @@ -29,10 +29,10 @@ |
29 | 29 | referConfigQuery.setNeed("true"); |
30 | 30 | if(null != referConfigQuery.getNeed()) { |
31 | 31 | referConfigQuery.mysqlBuild((int) referConfigDao.queryCount(mongoQuery)); |
32 | - mongoQuery.start(referConfigQuery.getOffset()).end(referConfigQuery.getLimit()).addOrder(Sort.Direction.DESC, "name"); | |
32 | + mongoQuery.start(referConfigQuery.getOffset()).end(referConfigQuery.getLimit()).addOrder(Sort.Direction.ASC, "name"); | |
33 | 33 | } |
34 | 34 | |
35 | - return referConfigDao.queryRefer(mongoQuery); | |
35 | + return referConfigDao.queryRefer(mongoQuery.addOrder(Sort.Direction.DESC, "createDate")); | |
36 | 36 | } |
37 | 37 | |
38 | 38 | public void addRefer(ReferValue referValue) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
View file @
33b9865
... | ... | @@ -148,6 +148,7 @@ |
148 | 148 | } |
149 | 149 | |
150 | 150 | RolesQuery rolesQuery = new RolesQuery(); |
151 | + rolesQuery.setYn(YnEnums.YES.getId()); | |
151 | 152 | rolesQuery.setName(name); |
152 | 153 | if(0 < rolesService.queryRolesCount(rolesQuery)) { |
153 | 154 | ResultUtils.buildResultAndWrite(response,ErrorCodeConstants.NAME_EXIST, "角色名称已存在"); |
... | ... | @@ -194,6 +195,7 @@ |
194 | 195 | } |
195 | 196 | |
196 | 197 | RolesQuery rolesQuery = new RolesQuery(); |
198 | + rolesQuery.setYn(YnEnums.YES.getId()); | |
197 | 199 | rolesQuery.setName(name); |
198 | 200 | if(0 < rolesService.queryRolesCount(rolesQuery)) { |
199 | 201 | ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.NAME_EXIST, "角色名称已存在"); |