From 14740ce2cc7feeabc841deeffed93bd30849c583 Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 7 Aug 2026 10:32:00 +0800 Subject: [PATCH 1/9] =?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 f297d06727d2f4812d23aaef183f662716c443df Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Mon, 10 Aug 2026 16:01:35 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=B8=8D=E6=9F=A5=E8=AF=A2admin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/enforcementcode/EfcodeVirtualUnitMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml index 600a3128..51bc46b6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml @@ -26,7 +26,7 @@ FROM sys_user u LEFT JOIN sys_dept d ON u.dept_id = d.dept_id - WHERE u.del_flag = '0' and d.dept_id != 405 + WHERE u.del_flag = '0' and d.dept_id != 405 and u.user_name != 'admin' AND (u.dept_id = #{sysDeptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE t.del_flag = '0' AND FIND_IN_SET(#{sysDeptId}, t.ancestors) From 66392a5ad396d47e48ace183eb1a1c776fbb9263 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Mon, 10 Aug 2026 17:25:28 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E9=9D=9E?= =?UTF-8?q?=E8=A1=8C=E6=94=BF=EF=BC=8C=E5=85=B6=E4=BB=96=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/enforcement/AppEnfCpPlanController.java | 3 ++- .../enforcementcode/domain/NonEnforcementRegistration.java | 6 ++++-- .../domain/vo/NonEnforcementRegistrationVo.java | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java index 39ed6fad..dfd74ee4 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java @@ -80,7 +80,8 @@ public class AppEnfCpPlanController extends EfcodeCpPlanController { */ @GetMapping("/reserve/check/{targetPlanId}") public R checkCanReserve(@PathVariable String targetPlanId) { - return cpReserveService.checkCanReserve(targetPlanId); + cpReserveService.checkCanReserve(targetPlanId); + return R.ok(); } /** diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/NonEnforcementRegistration.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/NonEnforcementRegistration.java index 51e826f0..700d33e6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/NonEnforcementRegistration.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/NonEnforcementRegistration.java @@ -16,9 +16,9 @@ import java.io.Serial; * @date 2026-05-19 */ @Data -@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode(callSuper = false) @TableName("non_enforcement_registration") -public class NonEnforcementRegistration extends BaseEntity { +public class NonEnforcementRegistration { @Serial private static final long serialVersionUID = 1L; @@ -184,5 +184,7 @@ public class NonEnforcementRegistration extends BaseEntity { */ private String reason; + private String createBy; + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/NonEnforcementRegistrationVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/NonEnforcementRegistrationVo.java index f823ece5..ffdfef88 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/NonEnforcementRegistrationVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/NonEnforcementRegistrationVo.java @@ -233,4 +233,5 @@ public class NonEnforcementRegistrationVo implements Serializable { */ private String area; + private String createBy; } From 539079f0009e22257a4144351c3b044600893726 Mon Sep 17 00:00:00 2001 From: vincent Date: Mon, 10 Aug 2026 17:38:18 +0800 Subject: [PATCH 4/9] =?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); } From 008585db15ab36f287e173a7219daa5789db63a7 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Mon, 10 Aug 2026 17:53:38 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E8=AE=A1=E5=88=92=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/enforcement/AppEnfCpPlanController.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/AppEnfCpPlanController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java index dfd74ee4..16613bc8 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java @@ -80,8 +80,8 @@ public class AppEnfCpPlanController extends EfcodeCpPlanController { */ @GetMapping("/reserve/check/{targetPlanId}") public R checkCanReserve(@PathVariable String targetPlanId) { - cpReserveService.checkCanReserve(targetPlanId); - return R.ok(); + return cpReserveService.checkCanReserve(targetPlanId); + } /** From a19d7cb37accff0c7359579ce922b1092e5bd3a1 Mon Sep 17 00:00:00 2001 From: vincent Date: Mon, 10 Aug 2026 17:56:50 +0800 Subject: [PATCH 6/9] =?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 --- .../enforcementcode/service/impl/EnterpriseUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5a47fd87..f8365199 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::getDelFlag, "0"); return baseMapper.selectVoOne(lqw); } From 46597c7eb5ddc4a17cc9f529ee9b674600d594c3 Mon Sep 17 00:00:00 2001 From: zhuibobo Date: Tue, 11 Aug 2026 06:55:31 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=95=E8=B4=A6=E5=8F=B7,=E5=87=86?= =?UTF-8?q?=E5=A4=87=E8=AF=95=E8=BF=90=E8=A1=8C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zdxt-admin-plus-ui/src/views/login.vue | 12 +----------- .../src/views/enforcement/loginByPassword.vue | 9 +-------- .../src/views/enterprise/auth/loginByPassword.vue | 9 +-------- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue index 38dddb0d..b49f87bf 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue @@ -153,17 +153,7 @@ interface TestUser { } const testUsers = ref([ - { label: '超级管理员', tenantId: '000000', username: 'admin', password: 'szsf@zfjd' }, - { label: '深圳市司法局-刘倩琳', tenantId: '000000', username: 'liuqianlin', password: 'szsf@zfjd' }, - { label: '深圳市审计局-杜啟艺', tenantId: '000000', username: 'duqiyi', password: 'szsf@zfjd' }, - { label: '深圳市龙岗区司法局-黄占海', tenantId: '000000', username: 'huangzhanhai', password: 'szsf@zfjd' }, - { label: '深圳市南山区司法局-梁有志', tenantId: '000000', username: 'liangyouzhi', password: 'szsf@zfjd' }, - { label: '深圳市坪山区司法局-李旺', tenantId: '000000', username: 'liwang4', password: 'szsf@zfjd' }, - { label: '深圳市光明区司法局-李振禧', tenantId: '000000', username: 'lizhenxi', password: 'szsf@zfjd' }, - { label: '深圳市光明区司法局-王亚伟', tenantId: '000000', username: 'wangyawei3', password: 'szsf@zfjd' }, - { label: '光明区光明街道-梁紫微', tenantId: '000000', username: 'liangziwei', password: 'szsf@zfjd' }, - { label: '光明区公明街道-郑尚', tenantId: '000000', username: 'zhengshang', password: 'szsf@zfjd' }, - { label: '光明区马田街道-吴志伟', tenantId: '000000', username: 'wuzhiwei5', password: 'szsf@zfjd' } + ]); const selectTestUser = (user: TestUser) => { 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 984077a4..a5afa4ac 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 @@ -88,14 +88,7 @@ const navigateTo = (target) => { } }; const testUsers = [ - {loginUserId:"0001002",account: 'cuifengyuan', name: '崔峰源', password: 'szsf@zfjd',bureauUnitName:"深圳市司法局"}, - {loginUserId:"0001001",account: 'liuqianlin', name: '刘倩琳', password: 'szsf@zfjd',bureauUnitName:"深圳市司法局"}, - {loginUserId:"0001003",account: 'baining', name: '白宁', password: 'szsf@zfjd',bureauUnitName:"深圳市坪山区司法局"}, - {loginUserId:"0001004",account: 'caizifan', name: '蔡梓帆', password: 'szsf@zfjd',bureauUnitName:"深圳市福田区司法局"}, - {loginUserId:"0001005",account: 'chenchong4', name: '陈冲', password: 'szsf@zfjd',bureauUnitName:"深圳市宝安区司法局"}, - {loginUserId:"0001006",account: 'chenggaozhan', name: '程高展', password: 'szsf@zfjd',bureauUnitName:"深圳市南山区司法局"}, - {loginUserId:"0001007",account: 'chenhaitao2', name: '陈海涛', password: 'szsf@zfjd',bureauUnitName:"深圳市南山区司法局"}, - {loginUserId:"0001008",account: 'chenhanyu', name: '陈汉羽', password: 'szsf@zfjd',bureauUnitName:"深圳市坪山区司法局"} + ]; const selectTestUser = (item) => { diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/auth/loginByPassword.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/auth/loginByPassword.vue index 39d5174a..458f4820 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/auth/loginByPassword.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/auth/loginByPassword.vue @@ -52,14 +52,7 @@ const isLocalhost = ref(window.location.hostname === 'localhost'); const showTestPicker = ref(false); const testEnterprises = [ - { account: 'free_kylin', name: '新粤云（深圳）信息技术有限公司', password: 'szsf@zfjd' }, - { account: 'weil45', name: '深圳农牧美益肉业有限公司', password: 'szsf@zfjd' }, - { account: 'DGD440881199506180622', name: '深圳市深水龙岗污水处理有限公司', password: 'szsf@zfjd' }, - { account: 'smiledzb1982', name: '深圳康泰生物制品股份有限公司', password: 'szsf@zfjd' }, - { account: 'A7271888', name: '深圳市里程食品有限公司', password: 'szsf@zfjd' }, - { account: 'qintongzhen138', name: '欧姆龙电子部件（深圳）有限公司', password: 'szsf@zfjd' }, - { account: 'XP073215', name: '深圳市强达电路股份有限公司', password: 'szsf@zfjd' }, - { account: '33ef1970fd449676fa4bc197', name: '吉田拉链（深圳）有限公司公明工厂', password: 'szsf@zfjd' }, + ]; const selectTestEnterprise = (item) => { From edf10ae4dbf0ce0a9a6080118169010f998808c4 Mon Sep 17 00:00:00 2001 From: zhuibobo Date: Tue, 11 Aug 2026 06:56:30 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=95=E8=B4=A6=E5=8F=B7,=E5=87=86?= =?UTF-8?q?=E5=A4=87=E8=AF=95=E8=BF=90=E8=A1=8C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue index b49f87bf..b85f4c33 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue @@ -114,7 +114,7 @@ const { t } = useI18n(); const loginForm = ref({ tenantId: '000000', username: 'admin', - password: 'admin123', + password: '', rememberMe: false, code: '', uuid: '' From 1de309184141f795ee21e90c7d4d94a3ee2d5722 Mon Sep 17 00:00:00 2001 From: zhuibobo Date: Tue, 11 Aug 2026 06:56:55 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=95=E8=B4=A6=E5=8F=B7,=E5=87=86?= =?UTF-8?q?=E5=A4=87=E8=AF=95=E8=BF=90=E8=A1=8C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue index b85f4c33..60c2f3f6 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue @@ -113,7 +113,7 @@ const { t } = useI18n(); const loginForm = ref({ tenantId: '000000', - username: 'admin', + username: '', password: '', rememberMe: false, code: '',