소스 검색

Merge branch 'master' of http://db.comtti.net:80/comtika2019/fad-comtika-safe.git

comtika2019 3 년 전
부모
커밋
acb82457d2
1개의 변경된 파일3개의 추가작업 그리고 1개의 파일을 삭제
  1. 3 1
      src/main/java/com/comtika/safe/service/mobile/impl/MobileServiceImpl.java

+ 3 - 1
src/main/java/com/comtika/safe/service/mobile/impl/MobileServiceImpl.java

@@ -34,7 +34,9 @@ public class MobileServiceImpl implements IMobileService {
     @Override
     public RespWrapper<Map<String, Object>> findUserSiteEleTotal(EleTotalQueryHelp help, UserCoreCache userCache) {
         Map<String,Object> condition = new HashMap<>(8);
-        if (!ProjectConstant.ADMIN.equals(userCache.getLoginName())) {
+        if(help.getSiteId() != null){
+            condition.put("siteIds", Arrays.asList(help.getSiteId()));
+        }else if (!ProjectConstant.ADMIN.equals(userCache.getLoginName())) {
             condition.put("siteIds", userCache.getSiteData());
         }
         if(help.getStartTime() != null && help.getEndTime() != null){