From a8532829576525655e521229152a25e329696eb1 Mon Sep 17 00:00:00 2001 From: vincent Date: Thu, 20 Aug 2026 11:52:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=A7=E6=B3=95=E7=AB=AF?= =?UTF-8?q?=E5=85=AC=E5=AE=89=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/enforcement/AppEnfLoginController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 2a8bbe0f..9f9d1268 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 @@ -122,6 +122,12 @@ public class AppEnfLoginController extends LoginController { // return R.fail("该用户不是执法人员，无法登录执法端"); } + // 没有执法证件号时，降级判断是否为公安人员（zone=5或15） + if (!isLawOfficer && bureauDept != null + && (5 == bureauDept.getZone() || 15 == bureauDept.getZone())) { + isLawOfficer = true; + } + // 8. 手机号解密处理(如是加密存储则返回明文以供前端展示与业务使用) String phonenumber = user.getPhonenumber(); if (CommonUtil.isPhoneEncrypted(phonenumber)) { @@ -191,11 +197,17 @@ public class AppEnfLoginController extends LoginController { // return R.fail("该用户不是执法人员，无法登录执法端"); } + // 7. 查询部门信息 SrzDeptVo srzOrgan = com.zdxt.enforcementcode.common.util.DataFilterUtil.getUserOrganDept(user.getUserId()); SysDeptVo sysDept = com.zdxt.enforcementcode.common.util.DataFilterUtil.getUserSysDept(user.getUserId()); SysDeptVo bureauDept = com.zdxt.enforcementcode.common.util.DataFilterUtil.getUserBureauDept(user.getUserId()); + // 没有执法证件号时，降级判断是否为公安人员（zone=5或15） + if (!isLawOfficer && bureauDept != null + && (5 == bureauDept.getZone() || 15 == bureauDept.getZone())) { + isLawOfficer = true; + } // 7. 构建LoginUser并生成SaToken token = doSaTokenLogin(user.getUserId(), user.getUserName(), user.getNickName(), user.getDeptId(), "app_user", "enforcement_app", "f0535c2a32ab4d0496ab9a699b2a7d36");