From 77d3247b883504dcdc0c0ec87e9943673422fd24 Mon Sep 17 00:00:00 2001 From: vincent Date: Mon, 17 Aug 2026 10:40:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enforcement/AppEnfLoginController.java | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 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 9bfc3c76..2a8bbe0f 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 @@ -87,9 +87,9 @@ public class AppEnfLoginController extends LoginController { } // 6. 检查执法证件号是否为空 - if (user.getLawCertificateNum() == null || user.getLawCertificateNum().isBlank()) { - return R.fail("该用户不是执法人员，无法登录执法端"); - } +// if (user.getLawCertificateNum() == null || user.getLawCertificateNum().isBlank()) { +// return R.fail("该用户不是执法人员，无法登录执法端"); +// } // 7. 查询部门信息 SrzDeptVo srzOrgan = com.zdxt.enforcementcode.common.util.DataFilterUtil.getUserOrganDept(user.getUserId()); @@ -108,13 +108,19 @@ public class AppEnfLoginController extends LoginController { if (sysDept == null) { return R.fail("该用户未关联部门，无法登录执法端"); } - if (bureauDept == null) { - return R.fail("该用户未关联执法单位，无法登录执法端"); - } +// if (bureauDept == null) { +// return R.fail("该用户未关联执法单位，无法登录执法端"); +// } if (!sysDept.getDeptId().equals(user.getDeptId())){ return R.fail("部门ID查找错误!"); } + boolean isLawOfficer = true; +// 6. 检查执法证件号是否为空 + if (user.getLawCertificateNum() == null || user.getLawCertificateNum().isBlank()) { + isLawOfficer = false; +// return R.fail("该用户不是执法人员，无法登录执法端"); + } // 8. 手机号解密处理(如是加密存储则返回明文以供前端展示与业务使用) String phonenumber = user.getPhonenumber(); @@ -139,7 +145,7 @@ public class AppEnfLoginController extends LoginController { data.put("bureauUnitId", bureauDept.getDeptId()); data.put("bureauUnitName", bureauDept.getDeptName()); - data.put("lawOfficer", true); + data.put("lawOfficer", isLawOfficer); data.put("platformType", PlatformTypeEnums.ENFORCEMENT.getKey()); return R.ok(data); } @@ -178,9 +184,11 @@ public class AppEnfLoginController extends LoginController { return R.fail("该用户已被停用"); } - // 6. 检查执法证件号是否为空 + boolean isLawOfficer = true; +// 6. 检查执法证件号是否为空 if (user.getLawCertificateNum() == null || user.getLawCertificateNum().isBlank()) { - return R.fail("该用户不是执法人员，无法登录执法端"); + isLawOfficer = false; +// return R.fail("该用户不是执法人员，无法登录执法端"); } // 7. 查询部门信息 @@ -200,9 +208,9 @@ public class AppEnfLoginController extends LoginController { if (sysDept == null) { return R.fail("该用户未关联部门，无法登录执法端"); } - if (bureauDept == null) { - return R.fail("该用户未关联执法单位，无法登录执法端"); - } +// if (bureauDept == null) { +// return R.fail("该用户未关联执法单位，无法登录执法端"); +// } if (!sysDept.getDeptId().equals(user.getDeptId())){ return R.fail("部门ID查找错误!"); @@ -231,7 +239,7 @@ public class AppEnfLoginController extends LoginController { data.put("bureauUnitId", bureauDept.getDeptId()); data.put("bureauUnitName", bureauDept.getDeptName()); - data.put("lawOfficer", true); + data.put("lawOfficer", isLawOfficer); data.put("platformType", PlatformTypeEnums.ENFORCEMENT.getKey()); return R.ok(data); } catch (Exception e) {