diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java
index 45b5956e..ad2dcea2 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java
@@ -71,9 +71,9 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService {
         if(userId !=1) {
             Map<String, Object> landUser = xhpcChargingStationService.getLandUser(userId);
             if(landUser !=null){
-                if(landUser.get("operatorId") !=null){
-                    Long operatorId = Long.valueOf(landUser.get("operatorId").toString());
+                if(landUser.get("userType") !=null){
                     if("01".equals(landUser.get("userType").toString())){
+                        Long operatorId = Long.valueOf(landUser.get("operatorId").toString());
                         list= xhpcChargingPileMapper.selectXhpcChargingPileList(name, type, serialNumber, chargingStationId,operatorId,1);
                     }else{
                         list= xhpcChargingPileMapper.selectXhpcChargingPileList(name, type, serialNumber, chargingStationId,userId,2);
diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java
index 8dc0a55d..44b4c04f 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java
@@ -112,9 +112,9 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi
         if(userId !=1) {
             Map<String, Object> landUser = xhpcChargingStationMapper.getLandUser(userId);
             if(landUser !=null){
-                if(landUser.get("operatorId") !=null){
-                    Long operatorId = Long.valueOf(landUser.get("operatorId").toString());
+                if(landUser.get("userType") !=null){
                     if("01".equals(landUser.get("userType").toString())){
+                        Long operatorId = Long.valueOf(landUser.get("operatorId").toString());
                         //运营商看自己的场站
                         list = xhpcChargingStationMapper.selectXhpcChargingStationList(name, operatorName,operatorId,1);
                     }else{
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java
index 0bc76bf8..cf8d9c38 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java
@@ -90,9 +90,9 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService {
         if(userId !=1){
             Map<String, Object> landUser = xhpcHistoryOrderMapper.getLandUser(logUserId);
             if(landUser !=null){
-                if(landUser.get("operatorId") !=null){
-                    Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
+                if(landUser.get("userType") !=null){
                     if("01".equals(landUser.get("userType").toString())){
+                        Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
                         //运营商看自己的场站
                         list = xhpcHistoryOrderMapper.getListPage(phone,transactionNumber,1,chargingStationName,operatorId,source,startTime,endTime,logOperatorId,type,number);
                     }else{
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
index 8aa7ef31..28aaedb2 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
@@ -83,9 +83,9 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
         if(userId !=1) {
             Map<String, Object> landUser = xhpcHistoryOrderService.getLandUser(logUserId);
             if(landUser !=null){
-                if(landUser.get("operatorId") !=null){
-                    Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
+                if(landUser.get("userType") !=null){
                     if("01".equals(landUser.get("userType").toString())){
+                        Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
                         //运营商看自己的场站
                         list = xhpcRealTimeOrderMapper.list(phone,transactionNumber,source,chargingStationName,terminalName,operatorId,startTime,endTime,number,status,logOperatorId,1);
                     }else{
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
index 1b784d1f..892bc6ab 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
@@ -44,9 +44,9 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         if(userId !=1){
             Map<String, Object> landUser = xhpcHistoryOrderService.getLandUser(logUserId);
             if(landUser !=null){
-                if(landUser.get("operatorId") !=null){
-                    Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
+                if(landUser.get("userType") !=null){
                     if("01".equals(landUser.get("userType").toString())){
+                        Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
                         //运营商看自己的场站
                         list = xhpcStatisticsServiceMapper.getTimeIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId);
                     }else{
@@ -166,9 +166,9 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         if(userId !=1){
             Map<String, Object> landUser = xhpcHistoryOrderService.getLandUser(logUserId);
             if(landUser !=null){
-                if(landUser.get("operatorId") !=null){
-                    Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
+                if(landUser.get("userType") !=null){
                     if("01".equals(landUser.get("userType").toString())){
+                        Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
                         //运营商看自己的场站
                         list = xhpcStatisticsServiceMapper.getDateIntervalPage(chargingStationId, internetUserId, operatorId, startTime, endTime, 1,logOperatorId);
                     }else{
@@ -204,9 +204,9 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         if(userId !=1){
             Map<String, Object> landUser = xhpcHistoryOrderService.getLandUser(logUserId);
             if(landUser !=null){
-                if(landUser.get("operatorId") !=null){
-                    Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
+                if(landUser.get("userType") !=null){
                     if("01".equals(landUser.get("userType").toString())){
+                        Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
                         //运营商看自己的场站
                         list = xhpcStatisticsServiceMapper.getStationIntervalPage(chargingStationId,operatorUserId,internetUserId,operatorId,startTime,endTime,1,logOperatorId);
                     }else{
@@ -239,9 +239,9 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         if(userId !=1){
             Map<String, Object> landUser = xhpcHistoryOrderService.getLandUser(logUserId);
             if(landUser !=null){
-                if(landUser.get("operatorId") !=null){
-                    Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
+                if(landUser.get("userType") !=null){
                     if("01".equals(landUser.get("userType").toString())){
+                        Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
                         //运营商看自己的场站
                         list = xhpcStatisticsServiceMapper.getOperatorIntervalPage(operatorUserId, operatorId, startTime, endTime, 1,logOperatorId);
                     }else{
@@ -285,9 +285,9 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         if(userId !=1){
             Map<String, Object> landUser = xhpcHistoryOrderService.getLandUser(logUserId);
             if(landUser !=null){
-                if(landUser.get("operatorId") !=null){
-                    Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
+                if(landUser.get("userType") !=null){
                     if("01".equals(landUser.get("userType").toString())){
+                        Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
                         //运营商看自己的场站
                         list = xhpcStatisticsServiceMapper.getTerminalIntervalPage(chargingStationId, terminalId, operatorId, startTime, endTime, type,logOperatorId);
                     }else{
@@ -312,9 +312,9 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         if(userId !=1){
             Map<String, Object> landUser = xhpcHistoryOrderService.getLandUser(logUserId);
             if(landUser !=null){
-                if(landUser.get("operatorId") !=null){
-                    Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
+                if(landUser.get("userType") !=null){
                     if("01".equals(landUser.get("userType").toString())){
+                        Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
                         //运营商看自己的场站
                         return AjaxResult.success(xhpcStatisticsServiceMapper.getChargingStationList(operatorId, logOperatorId, 1));
                     }else{
@@ -336,9 +336,9 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         if(userId !=1){
             Map<String, Object> landUser = xhpcHistoryOrderService.getLandUser(logUserId);
             if(landUser !=null){
-                if(landUser.get("operatorId") !=null){
-                    Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
+                if(landUser.get("userType") !=null){
                     if("01".equals(landUser.get("userType").toString())){
+                        Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
                         //运营商看自己的场站
                         return AjaxResult.success(xhpcStatisticsServiceMapper.getOperatorList(operatorId, logOperatorId, 1));
                     }else{
@@ -366,9 +366,9 @@ public class XhpcStatisticsServiceImpl implements IXhpcStatisticsService {
         if(userId !=1){
             Map<String, Object> landUser = xhpcHistoryOrderService.getLandUser(logUserId);
             if(landUser !=null){
-                if(landUser.get("operatorId") !=null){
-                    Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
+                if(landUser.get("userType") !=null){
                     if("01".equals(landUser.get("userType").toString())){
+                        Long logOperatorId = Long.valueOf(landUser.get("operatorId").toString());
                         //运营商看自己的场站
                         return AjaxResult.success(xhpcStatisticsServiceMapper.getTerminalList(chargingStationId, logOperatorId, 1));
                     }else{