From a722fc15c47e2e41f558f14bd2ed2c85ef02ada0 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Tue, 2 Jun 2026 18:37:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E4=BF=AE?= =?UTF-8?q?=E6=94=B9bug=E5=BB=BA=E8=AE=A1=E5=88=92=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E4=BA=86=EF=BC=8C=E4=BD=86=E6=98=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=AE=A1=E5=88=92=E9=A1=B5=E9=9D=A2=E8=BF=98=E6=98=AF?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=87=BA=E6=9D=A5=E4=BA=86=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=81=9A=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...forcementInspectionProgramServiceImpl.java | 55 +++++++++++-------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementInspectionProgramServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementInspectionProgramServiceImpl.java index bb98d114..c15ae2ea 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementInspectionProgramServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementInspectionProgramServiceImpl.java @@ -15,7 +15,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.translation.annotation.Translation; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.zdxt.enforcementcode.domain.bo.EnforcementInspectionProgramBo; import com.zdxt.enforcementcode.domain.vo.EnforcementInspectionProgramVo; import com.zdxt.enforcementcode.domain.EnforcementInspectionProgram; @@ -269,14 +271,22 @@ public class EnforcementInspectionProgramServiceImpl implements IEnforcementInsp * @return 是否新增成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(EnforcementInspectionProgramBo bo) { + Long userId = LoginHelper.getUserId(); + String username = LoginHelper.getUsername(); + + if (userId == null) { + throw new IllegalArgumentException("用户未登录或登录已过期"); + } + EnforcementInspectionProgram add = MapstructUtils.convert(bo, EnforcementInspectionProgram.class); add.setCreateTime(DateUtils.getNowDate()); add.setId(IdUtil.simpleUUID()); - add.setUserId(LoginHelper.getUserId() +""); + add.setUserId(userId.toString()); add.setDeptId(LoginHelper.getDeptId()); - add.setCreateBy(LoginHelper.getUserId()); - add.setCreateByName(LoginHelper.getUsername()); + add.setCreateBy(userId); + add.setCreateByName(username); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag && bo.getFileList() != null && !bo.getFileList().isEmpty()) { @@ -285,25 +295,26 @@ public class EnforcementInspectionProgramServiceImpl implements IEnforcementInsp ZdxtFile zdxtFile = new ZdxtFile(); zdxtFile.setGuid(IdUtil.simpleUUID()); zdxtFile.setBusinessId(add.getId()); - zdxtFile.setUploadPath(file.getUploadPath()); + + String uploadPath = file.getUploadPath(); + if (StringUtils.isBlank(uploadPath)) { + throw new IllegalArgumentException("文件上传路径不能为空"); + } + zdxtFile.setUploadPath(uploadPath); zdxtFile.setFileName(file.getFileName()); // 从文件路径中截取文件名称 - String fileUrl = file.getUploadPath(); String fileSaveName = null; - if (fileUrl != null && !fileUrl.isEmpty()) { - // 处理 URL 路径或文件路径 - int lastSlashIndex = Math.max(fileUrl.lastIndexOf("/"), fileUrl.lastIndexOf("\\")); - if (lastSlashIndex != -1 && lastSlashIndex < fileUrl.length() - 1) { - fileSaveName = fileUrl.substring(lastSlashIndex + 1); - } else { - fileSaveName = fileUrl; - } - // 去除 URL 参数（如果有） - int questionMarkIndex = fileSaveName.indexOf("?"); - if (questionMarkIndex != -1) { - fileSaveName = fileSaveName.substring(0, questionMarkIndex); - } + int lastSlashIndex = Math.max(uploadPath.lastIndexOf("/"), uploadPath.lastIndexOf("\\")); + if (lastSlashIndex != -1 && lastSlashIndex < uploadPath.length() - 1) { + fileSaveName = uploadPath.substring(lastSlashIndex + 1); + } else { + fileSaveName = uploadPath; + } + // 去除 URL 参数（如果有） + int questionMarkIndex = fileSaveName.indexOf("?"); + if (questionMarkIndex != -1) { + fileSaveName = fileSaveName.substring(0, questionMarkIndex); } zdxtFile.setFileSaveName(fileSaveName); @@ -316,11 +327,11 @@ public class EnforcementInspectionProgramServiceImpl implements IEnforcementInsp } // 设置上传人信息 - zdxtFile.setUploadPersonId(LoginHelper.getUserId().toString()); - zdxtFile.setUploadPersonName(LoginHelper.getUsername()); + zdxtFile.setUploadPersonId(userId.toString()); + zdxtFile.setUploadPersonName(username); zdxtFile.setUploadTime(DateUtils.getNowDate()); - zdxtFile.setCreateBy(LoginHelper.getUserId()); - zdxtFile.setUpdateBy(LoginHelper.getUserId()); + zdxtFile.setCreateBy(userId); + zdxtFile.setUpdateBy(userId); zdxtFile.setCreateTime(DateUtils.getNowDate()); zdxtFile.setUpdateTime(DateUtils.getNowDate()); From 28775448b38d9f0b6f20506a0fb485da6670133c Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Tue, 2 Jun 2026 19:27:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E4=BF=AE?= =?UTF-8?q?=E6=94=B9bug=E6=B6=88=E6=81=AF=E3=80=8B=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E8=BE=93=E5=85=A5=E8=AE=A1=E5=88=92=E5=90=8D?= =?UTF-8?q?=E7=A7=B0/=E5=8D=95=E4=BD=8D=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=B2=A1=E6=9C=89=E6=A0=B9=E6=8D=AE=E6=89=80?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=9D=A1=E4=BB=B6=E8=BF=9B=E8=A1=8C=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/bo/EnterpriseLawEnforcementBo.java | 4 ++++ .../impl/EnterpriseLawEnforcementServiceImpl.java | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseLawEnforcementBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseLawEnforcementBo.java index 9fa03060..98e5dab0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseLawEnforcementBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseLawEnforcementBo.java @@ -195,4 +195,8 @@ public class EnterpriseLawEnforcementBo extends BaseEntity { private String checkHourEnd; + /** + * 多参数查询 + */ + private String queryParam; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseLawEnforcementServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseLawEnforcementServiceImpl.java index e8f37f84..693e3c2c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseLawEnforcementServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -77,7 +77,15 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(EnterpriseLawEnforcement::getId); - lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcement()), EnterpriseLawEnforcement::getLawEnforcement, bo.getLawEnforcement()); + + if (bo.getQueryParam()!= null && StringUtils.isNotBlank(bo.getQueryParam())){ + lqw.and(wrapper -> wrapper + .like(EnterpriseLawEnforcement::getBureauDeptName, bo.getQueryParam()) + .or() + .like(EnterpriseLawEnforcement::getCheckItemText, bo.getQueryParam()) + ); + } + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcementId()), EnterpriseLawEnforcement::getLawEnforcementId, bo.getLawEnforcementId()); lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseId()), EnterpriseLawEnforcement::getEnterpriseId, bo.getEnterpriseId()); lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), EnterpriseLawEnforcement::getEnterpriseName, bo.getEnterpriseName()); @@ -102,7 +110,7 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc lqw.eq(bo.getIsReg() != null, EnterpriseLawEnforcement::getIsReg, bo.getIsReg()); lqw.eq(bo.getMainDeputyOrder() != null, EnterpriseLawEnforcement::getMainDeputyOrder, bo.getMainDeputyOrder()); lqw.eq(StringUtils.isNotBlank(bo.getTmpDeptJson()), EnterpriseLawEnforcement::getTmpDeptJson, bo.getTmpDeptJson()); - lqw.eq(StringUtils.isNotBlank(bo.getCheckItemText()), EnterpriseLawEnforcement::getCheckItemText, bo.getCheckItemText()); + lqw.eq(StringUtils.isNotBlank(bo.getCheckRequireText()), EnterpriseLawEnforcement::getCheckRequireText, bo.getCheckRequireText()); lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()), EnterpriseLawEnforcement::getBureauDeptId, bo.getBureauDeptId()); lqw.like(StringUtils.isNotBlank(bo.getBureauDeptName()), EnterpriseLawEnforcement::getBureauDeptName, bo.getBureauDeptName());