From 4fc00d9a58cdd889842eb76660208247b35a1c6a Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Sat, 30 May 2026 17:54:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF-=E8=BD=AE=E6=92=AD?= =?UTF-8?q?=E5=9B=BE=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/enforcement/AppEnfCarouselBannerController.java | 3 +-- .../enterprise/AppEnforcementCarouselBannerController.java | 3 +-- .../enterprise/AppEntEnforcementRegistrationController.java | 1 + .../service/impl/EnforcementRegistrationServiceImpl.java | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCarouselBannerController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCarouselBannerController.java index eb4031b6..331fbf25 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCarouselBannerController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCarouselBannerController.java @@ -56,8 +56,7 @@ public class AppEnfCarouselBannerController extends BaseController { * @param id 主键 */ @GetMapping("/getInfo") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { + public R getInfo(String id) { return R.ok(enforcementCarouselBannerService.queryById(id)); } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementCarouselBannerController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementCarouselBannerController.java index 4ee34589..c78cb04a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementCarouselBannerController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementCarouselBannerController.java @@ -66,8 +66,7 @@ public class AppEnforcementCarouselBannerController extends BaseController { * @param id 主键 */ @GetMapping("/getInfo") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { + public R getInfo(String id) { return R.ok(enforcementCarouselBannerService.queryById(id)); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java index e88c36c5..43dd1029 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java @@ -34,6 +34,7 @@ public class AppEntEnforcementRegistrationController extends BaseController { */ @GetMapping("/list") public TableDataInfo list(EnforcementRegistrationBo bo, PageQuery pageQuery) { + bo.setIsSubmit(1L); return enforcementRegistrationService.queryPageList(bo, pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java index b82eeaf5..3b638204 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java @@ -767,8 +767,8 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); // 已提交的数据 - // lqw.eq(EnforcementRegistration::getIsSubmit, 1L); - + lqw.eq((bo.getIsSubmit() !=null), + EnforcementRegistration::getIsSubmit, bo.getIsSubmit()); // 企业ID lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseId()), EnforcementRegistration::getEnterpriseId, bo.getEnterpriseId());