From fb212f44c7f40c6154e2ba74f98f02a99c0c98a1 Mon Sep 17 00:00:00 2001 From: vincent Date: Thu, 24 Sep 2026 17:33:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=89=A7=E6=B3=95?= =?UTF-8?q?=E7=AB=AF=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91=EF=BC=8C=E5=B1=8F?= =?UTF-8?q?=E8=94=BD=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/enforcement/AppEnfLoginController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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);