diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserConsumptionDetailsServiceImpl.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserConsumptionDetailsServiceImpl.java
index 5e4ef2f..2a3386c 100644
--- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserConsumptionDetailsServiceImpl.java
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserConsumptionDetailsServiceImpl.java
@@ -35,7 +35,10 @@ public class UserConsumptionDetailsServiceImpl implements IUserConsumptionDetail
         {
             UserConsumptionDetails userConsumptionDetails=value.get(i);
             UserConsumptionDetailsDto temp=new UserConsumptionDetailsDto();
-            temp.setUserName(sysUserMapper.selectUserById(userConsumptionDetails.getUserId()).getUserName());
+            if(userConsumptionDetails.getUserId()!=null)
+            {
+                temp.setUserName(sysUserMapper.selectUserById(userConsumptionDetails.getUserId()).getUserName());
+            }
             temp.setId(userConsumptionDetails.getId());
             temp.setUserId(userConsumptionDetails.getUserId());
             temp.setDeviceNumber(userConsumptionDetails.getDeviceNumber());
@@ -114,7 +117,11 @@ public class UserConsumptionDetailsServiceImpl implements IUserConsumptionDetail
         {
             UserConsumptionDetails userConsumptionDetails=value.get(i);
             UserConsumptionDetailsDto temp=new UserConsumptionDetailsDto();
-            temp.setUserName(sysUserMapper.selectUserById(userConsumptionDetails.getUserId()).getUserName());
+            if(userConsumptionDetails.getUserId()!=null)
+            {
+                temp.setUserName(sysUserMapper.selectUserById(userConsumptionDetails.getUserId()).getUserName());
+            }
+
             temp.setId(userConsumptionDetails.getId());
             temp.setUserId(userConsumptionDetails.getUserId());
             temp.setDeviceNumber(userConsumptionDetails.getDeviceNumber());
diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserIrrigationRecordServiceImpl.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserIrrigationRecordServiceImpl.java
index 831b456..8799415 100644
--- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserIrrigationRecordServiceImpl.java
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserIrrigationRecordServiceImpl.java
@@ -41,9 +41,17 @@ public class UserIrrigationRecordServiceImpl implements IUserIrrigationRecordSer
         {
             UserIrrigationRecordDto temp=new UserIrrigationRecordDto();
             temp.id=list.get(i).getId();
-            temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName()==null ? "" :sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName();
-            temp.deviceName=ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName() == null ? "":ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName();
-            temp.cardNumber=list.get(i).getCardNumber() == null ? "" : list.get(i).getCardNumber();
+            if(list.get(i).getUserId()!=null)
+            {
+                temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName()==null ? "" :sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName();
+
+            }
+            if(list.get(i).getDeviceNumber()!=null)
+            {
+                temp.deviceName=ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName() == null ? "":ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName();
+
+            }
+           temp.cardNumber=list.get(i).getCardNumber() == null ? "" : list.get(i).getCardNumber();
             temp.flow=list.get(i).getCurFlow()==null ? BigDecimal.valueOf(0) :list.get(i).getCurFlow();
             temp.startTime=list.get(i).getStartTime()==null ? null : list.get(i).getStartTime();
             temp.endTime=list.get(i).getEndTime()==null ? null :list.get(0).getEndTime();
@@ -67,8 +75,16 @@ public class UserIrrigationRecordServiceImpl implements IUserIrrigationRecordSer
         {
             UserIrrigationRecordDto temp=new UserIrrigationRecordDto();
             temp.id=list.get(i).getId();
-            temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName()==null ? "" :sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName();
-            temp.deviceName=ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName() == null ? "":ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName();
+            if(list.get(i).getUserId()!=null)
+            {
+                temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName()==null ? "" :sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName();
+
+            }
+            if(list.get(i).getDeviceNumber()!=null)
+            {
+                temp.deviceName=ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName() == null ? "":ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName();
+
+            }
             temp.cardNumber=list.get(i).getCardNumber() == null ? "" : list.get(i).getCardNumber();
             temp.flow=list.get(i).getCurFlow()==null ? BigDecimal.valueOf(0) :list.get(i).getCurFlow();
             temp.startTime=list.get(i).getStartTime()==null ? null : list.get(i).getStartTime();
@@ -94,8 +110,15 @@ public class UserIrrigationRecordServiceImpl implements IUserIrrigationRecordSer
         {
             UserIrrigationRecordDto temp=new UserIrrigationRecordDto();
             temp.id=list.get(i).getId();
-            temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName();
-            temp.deviceName=ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName();
+            if(list.get(i).getUserId()!=null)
+            {
+                temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName();
+            }
+            if(list.get(i).getDeviceNumber()!=null)
+            {
+                temp.deviceName=ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName();
+
+            }
             temp.cardNumber=list.get(i).getCardNumber();
             temp.flow=list.get(i).getCurFlow();
             temp.startTime=list.get(i).getStartTime();