Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java

@@ -116,16 +116,16 @@ public class UserServiceImpl implements UserService {
         if(null != agencyMap && agencyMap.size() > NumConstant.ZERO){
             agencyMap.forEach((agencyId,v) -> {
                 if(null != v && v.size() > NumConstant.ZERO){
-                    queryUserData(ModuleConstant.DIM_BELONGING_GRID,
+                    /*queryUserData(ModuleConstant.DIM_BELONGING_GRID,
                             agencyId,
                             // v.get(NumConstant.ZERO).getPid(),
                             v.get(NumConstant.ZERO).getCustomerId(),
                             new HashSet<>(v.get(NumConstant.ZERO).getGridIds()),
                             targetDate,
                             dataPacket,
-                            timeDimension);
-                    /*traverseGridUserDispose(agencyId,v.get(NumConstant.ZERO).getCustomerId(),new HashSet<>(v.get(NumConstant.ZERO).getGridIds())
-                            ,targetDate,dataPacket,timeDimension);*/
+                            timeDimension);*/
+                    traverseGridUserDispose(agencyId,v.get(NumConstant.ZERO).getCustomerId(),new HashSet<>(v.get(NumConstant.ZERO).getGridIds())
+                            ,targetDate,dataPacket,timeDimension);
                 }
             });
         }