diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java
index 2e9c6292..d4de0c6f 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java
@@ -649,8 +649,8 @@ public class DeviceController extends ControllerBase {
                 } else if (customer.getEnableState() == 0) {
                     sb.append("服务代理商状态为禁用;");
                 } else {
-                    device.setServiceAgentCode(customer.getAgencyCompanyName());
-                    device.setServiceAgentName(customer.getAgencyCompanyCode());
+                    device.setServiceAgentCode(customer.getAgencyCompanyCode());
+                    device.setServiceAgentName(customer.getAgencyCompanyName());
                 }
             }else {
                 device.setServiceAgentCode("");
diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java
index 27c775d5..711d2b3e 100644
--- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java
+++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java
@@ -672,8 +672,8 @@ public class DeviceController extends ControllerBase {
                 } else if (customer.getEnableState() == 0) {
                     sb.append("服务代理商状态为禁用;");
                 } else {
-                    device.setServiceAgentCode(customer.getAgencyCompanyName());
-                    device.setServiceAgentName(customer.getAgencyCompanyCode());
+                    device.setServiceAgentCode(customer.getAgencyCompanyCode());
+                    device.setServiceAgentName(customer.getAgencyCompanyName());
                 }
             }else {
                 device.setServiceAgentCode("");