Commit 88f54be2 authored by 赵啸非's avatar 赵啸非

添加根据部门id 查询所属大厅

parent 76dc0966
...@@ -230,7 +230,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -230,7 +230,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
} }
//如果是管理员 默认全部站点 //如果是管理员 默认全部站点
if (context.getUser().isAdmin() || context.getUser().getId() == 0L) { if (context.getUser().isAdmin() || context.getUser().getId() == 0L) {
log.info("user is admin ! id:{}",context.getUser().getId()); log.info("user is admin ! id:{}", context.getUser().getId());
siteList = this.find(new SiteQuery()); siteList = this.find(new SiteQuery());
} }
...@@ -510,9 +510,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -510,9 +510,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
if (!ObjectUtils.isEmpty(query.getSiteName())) { if (!ObjectUtils.isEmpty(query.getSiteName())) {
SiteEntity siteEntity = this.selectOne(new SiteQuery().siteName(query.getSiteName())); SiteEntity siteEntity = this.selectOne(new SiteQuery().siteName(query.getSiteName()));
if (!ObjectUtils.isEmpty(siteEntity)) { if (!ObjectUtils.isEmpty(siteEntity)) {
query.setAreaLevel(siteEntity.getAreaLevel()); AreaEntity areaCache = areaService.getCache(siteEntity.getAreaCode());
log.info("areaLevel:{}",query.getAreaLevel()); query.setAreaLevel(areaCache == null ? 1 : areaCache.getAreaLevel());
}else { log.info("areaLevel:{}", query.getAreaLevel());
} else {
return Rest.ok(new ArrayList<>()); return Rest.ok(new ArrayList<>());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment