From dc66e5ba1df76ffe81069bbf018e396e6ae4112b Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Thu, 17 Sep 2026 11:45:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=94=80=E6=9C=BA=E6=9E=84=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E7=9A=84=E6=9D=83=E9=99=90=E9=83=A8=E5=88=86=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enforcement/AppEnfLoginController.java | 38 ++++++++++++------- .../src/views/enforcement/loginByPassword.vue | 17 +++++---- .../src/views/enforcement/loginByV1System.vue | 17 +++++---- 3 files changed, 42 insertions(+), 30 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 52eb81f2..f37bcc6b 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 @@ -109,9 +109,10 @@ public class AppEnfLoginController extends LoginController { // 验证关键组织信息不能为空 - if (srzOrgan == null) { - return R.fail("该用户未关联认证机构，无法登录执法端"); - } + // 市认证机构非登录硬门槛，无映射时允许登录，organ 字段回空 +// if (srzOrgan == null) { +// return R.fail("该用户未关联认证机构，无法登录执法端"); +// } if (sysDept == null) { return R.fail("该用户未关联部门，无法登录执法端"); } @@ -153,11 +154,15 @@ 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.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.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); @@ -221,9 +226,10 @@ public class AppEnfLoginController extends LoginController { // 验证关键组织信息不能为空 - if (srzOrgan == null) { - return R.fail("该用户未关联认证机构，无法登录执法端"); - } + // 市认证机构非登录硬门槛，无映射时允许登录，organ 字段回空 +// if (srzOrgan == null) { +// return R.fail("该用户未关联认证机构，无法登录执法端"); +// } if (sysDept == null) { return R.fail("该用户未关联部门，无法登录执法端"); } @@ -253,11 +259,15 @@ 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.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.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); diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue index a5afa4ac..3f674f73 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue @@ -107,14 +107,15 @@ const doLogin = (secretName, secretKey) => { showFailToast("该用户未关联部门，无法登录"); return; } - if (!response.data.organId) { - showFailToast("该用户未关联认证机构，无法登录"); - return; - } - if (!response.data.bureauUnitId) { - showFailToast("该用户未关联执法单位，无法登录"); - return; - } + // 市认证机构/执法单位非登录硬门槛，无映射时允许登录并继续写 token + // if (!response.data.organId) { + // showFailToast("该用户未关联认证机构，无法登录"); + // return; + // } + // if (!response.data.bureauUnitId) { + // showFailToast("该用户未关联执法单位，无法登录"); + // return; + // } // 执法端登录成功 → 赋值用户基本信息 useCommon.SET_USER_PHONENUMBER(response.data.phonenumber || ""); useCommon.SET_USER_ID(response.data.userId); diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByV1System.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByV1System.vue index 7de9fe84..8f76c49b 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByV1System.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByV1System.vue @@ -106,14 +106,15 @@ const doLogin = (secretName, secretKey) => { showFailToast("该用户未关联部门，无法登录"); return; } - if (!response.data.organId) { - showFailToast("该用户未关联认证机构，无法登录"); - return; - } - if (!response.data.bureauUnitId) { - showFailToast("该用户未关联执法单位，无法登录"); - return; - } + // 市认证机构/执法单位非登录硬门槛，无映射时允许登录并继续写 token + // if (!response.data.organId) { + // showFailToast("该用户未关联认证机构，无法登录"); + // return; + // } + // if (!response.data.bureauUnitId) { + // showFailToast("该用户未关联执法单位，无法登录"); + // return; + // } // 执法端登录成功 → 赋值用户基本信息 useCommon.SET_USER_PHONENUMBER(response.data.phonenumber || ""); useCommon.SET_USER_ID(response.data.userId);