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

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){