diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java
index 7ade93de..48afe156 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java
@@ -153,11 +153,11 @@ public class AppEnfLoginController extends LoginController {
         data.put("deptId", user.getDeptId());
         data.put("deptName", sysDept.getDeptName());
 
-        data.put("organId", srzOrgan.getOrganizationid());
-        data.put("organName", srzOrgan.getName());
+        data.put("organId", srzOrgan != null ? srzOrgan.getOrganizationid() : "");
+        data.put("organName", srzOrgan != null ? srzOrgan.getName() : "");
 
-        data.put("bureauUnitId", bureauDept.getDeptId());
-        data.put("bureauUnitName", bureauDept.getDeptName());
+        data.put("bureauUnitId", bureauDept != null ? bureauDept.getDeptId() : "");
+        data.put("bureauUnitName", bureauDept != null ? bureauDept.getDeptName() : "");
         data.put("lawOfficer", isLawOfficer);
         data.put("platformType", PlatformTypeEnums.ENFORCEMENT.getKey());
         return R.ok(data);
@@ -253,11 +253,11 @@ public class AppEnfLoginController extends LoginController {
             data.put("deptId", user.getDeptId());
             data.put("deptName", sysDept.getDeptName());
 
-            data.put("organId", srzOrgan.getOrganizationid());
-            data.put("organName", srzOrgan.getName());
+            data.put("organId", srzOrgan != null ? srzOrgan.getOrganizationid() : "");
+            data.put("organName", srzOrgan != null ? srzOrgan.getName() : "");
 
-            data.put("bureauUnitId", bureauDept.getDeptId());
-            data.put("bureauUnitName", bureauDept.getDeptName());
+            data.put("bureauUnitId", bureauDept != null ? bureauDept.getDeptId() : "");
+            data.put("bureauUnitName", bureauDept != null ? bureauDept.getDeptName() : "");
             data.put("lawOfficer", isLawOfficer);
             data.put("platformType", PlatformTypeEnums.ENFORCEMENT.getKey());
             return R.ok(data);