From 14740ce2cc7feeabc841deeffed93bd30849c583 Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 7 Aug 2026 10:32:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BA=86=E6=89=A7=E6=B3=95=E8=AF=81=E4=BB=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/enforcement/AppEnfLoginController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 d9fadb4f..9bfc3c76 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 @@ -130,7 +130,7 @@ public class AppEnfLoginController extends LoginController { data.put("loginName", user.getLoginName()); data.put("nickName", user.getNickName()); data.put("phonenumber", phonenumber != null ? phonenumber : ""); - data.put("lawCertificateNum", user.getNickName()); + data.put("lawCertificateNum", user.getLawCertificateNum()); data.put("deptId", user.getDeptId()); data.put("deptName", sysDept.getDeptName()); @@ -222,7 +222,7 @@ public class AppEnfLoginController extends LoginController { data.put("loginName", user.getLoginName()); data.put("nickName", user.getNickName()); data.put("phonenumber", phonenumber != null ? phonenumber : ""); - data.put("lawCertificateNum", user.getNickName()); + data.put("lawCertificateNum", user.getLawCertificateNum()); data.put("deptId", user.getDeptId()); data.put("deptName", sysDept.getDeptName()); From 539079f0009e22257a4144351c3b044600893726 Mon Sep 17 00:00:00 2001 From: vincent Date: Mon, 10 Aug 2026 17:38:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/enterprise/AppEntLoginController.java | 2 +- .../enforcementcode/service/impl/EnterpriseUserServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLoginController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLoginController.java index bdca1b9c..1da566e7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLoginController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLoginController.java @@ -47,7 +47,7 @@ public class AppEntLoginController extends LoginController { } // 2. 根据登录名和用户类型查询用户 - EnterpriseUserVo user = enterpriseUserService.queryByLoginNameAndUserType(secretName, "00"); + EnterpriseUserVo user = enterpriseUserService.queryByLoginNameAndUserType(secretName, "app_user"); if (user == null) { return R.fail("用户不存在"); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseUserServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseUserServiceImpl.java index c5aaa16a..5a47fd87 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseUserServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseUserServiceImpl.java @@ -196,7 +196,7 @@ public class EnterpriseUserServiceImpl implements IEnterpriseUserService { public EnterpriseUserVo queryByLoginNameAndUserType(String loginName, String userType) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(EnterpriseUser::getLoginName, loginName); - lqw.eq(EnterpriseUser::getUserType, userType); +// lqw.eq(EnterpriseUser::getUserType, userType); return baseMapper.selectVoOne(lqw); }