Commit a40dbdb170da2f39f8d02f4635cdf8dbe04e1c75
1 parent
133f87811f
Exists in
master
and in
8 other branches
platform permission
add return pageinfo
Showing 1 changed file with 3 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
View file @
a40dbdb
| ... | ... | @@ -207,13 +207,13 @@ |
| 207 | 207 | organizationQuery.setLimit(limit); |
| 208 | 208 | organizationQuery.setKeyword(keyword); |
| 209 | 209 | |
| 210 | - if(regions.getLevel().equals(1)) { | |
| 210 | + if(null != regions && regions.getLevel().equals(1)) { | |
| 211 | 211 | organizationQuery.setProvinceId(areaId); |
| 212 | 212 | } |
| 213 | - if(regions.getLevel().equals(2)) { | |
| 213 | + if(null != regions && regions.getLevel().equals(2)) { | |
| 214 | 214 | organizationQuery.setCityId(areaId); |
| 215 | 215 | } |
| 216 | - if(regions.getLevel().equals(3)) { | |
| 216 | + if(null != regions && regions.getLevel().equals(3)) { | |
| 217 | 217 | organizationQuery.setAreaId(areaId); |
| 218 | 218 | } |
| 219 | 219 |