From 3d196019a9640694c58c0905e7054bf64a1b5da8 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Wed, 1 Apr 2026 10:44:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E4=BE=9B=E8=AF=95=E5=93=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hxhq/business/domain/Bacteria.java | 3 ++ .../business/service/impl/GspFfjlServiceImpl.java | 6 +-- .../business/service/impl/GspRkjlServiceImpl.java | 2 +- .../hxhq/business/service/impl/GspServiceImpl.java | 44 ++++++++++++++++------ .../system/service/impl/SysUserServiceImpl.java | 2 +- 5 files changed, 41 insertions(+), 16 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Bacteria.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Bacteria.java index 8fd718b..9b24089 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Bacteria.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Bacteria.java @@ -1,6 +1,8 @@ package com.hxhq.business.domain; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.TableName; import com.hxhq.common.core.domain.MpBaseEntity; @@ -43,6 +45,7 @@ public class Bacteria extends MpBaseEntity private Date sxr; /** 试验名称 */ + @TableField(exist = false) private String studyName; public String getStudyName() { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java index 01ee688..5a8d88c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java @@ -81,13 +81,13 @@ public class GspFfjlServiceImpl extends ServiceImpl impl queryWrapper.and(p -> p.apply("t.ffrq>={0}", form.getStartDateCk())); } if (StringUtils.isNoneBlank(form.getEndDateCk())) { - queryWrapper.apply("t.ffrq>={0}", form.getStartDateCk()); + queryWrapper.apply("t.ffrq<={0}", form.getEndDateCk()); } if (StringUtils.isNoneBlank(form.getStartDateRk())) { queryWrapper.and(p -> p.apply("t.ghrq>={0}", form.getStartDateRk())); } if (StringUtils.isNoneBlank(form.getEndDateRk())) { - queryWrapper.apply("t.ghrq>={0}", form.getEndDateRk()); + queryWrapper.apply("t.ghrq<={0}", form.getEndDateRk()); } if (StringUtils.isNoneBlank(form.getMd())) { queryWrapper.and(p -> p.like("t.md_other", form.getMd()) @@ -404,7 +404,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl queryWrapper.eq("jlzt", JlztEnum.wsd.getValue()); List gspFfjlList = this.list(queryWrapper); List gspFfjlJcgjList = new ArrayList<>(); - if (gspFfjlList.size() <= form.getIds().length) { + if (gspFfjlList.size() < form.getIds().length) { throw new ServiceException("发放记录发放记录不是未锁定状态，不能锁定"); } for (GspFfjl gspFfjl : gspFfjlList) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java index 31dadc8..d79b1e1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java @@ -253,7 +253,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl queryWrapper.eq("jlzt", JlztEnum.wsd.getValue()); List gspRkjlList = this.list(queryWrapper); List gspRkjlJcgjList = new ArrayList<>(); - if (gspRkjlList.size() <= form.getIds().length) { + if (gspRkjlList.size() < form.getIds().length) { throw new ServiceException("供试品入库记录不是未锁定状态，不能锁定"); } for (GspRkjl gspRkjl : gspRkjlList) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java index 558b2e2..484939b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java @@ -486,9 +486,15 @@ public class GspServiceImpl extends ServiceImpl implements IGspS SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); SysUser ffr1 = sysUserService.selectUserById(form.getFfrId()); - sysUserService.checkPassword(lqr1, form.getLqr1mm(), true); - sysUserService.checkPassword(lqr2, form.getLqr2mm(), true); - sysUserService.checkPassword(ffr1, form.getFfrmm(), true); + if(StringUtils.isEmpty(form.getLqr1mm()) || !SecurityUtils.matchesPassword(form.getLqr1mm(),lqr1.getPassword())) { + throw new ServiceException("钥匙领取人1密码错误"); + } + if(StringUtils.isEmpty(form.getLqr2mm()) || !SecurityUtils.matchesPassword(form.getLqr2mm(),lqr2.getPassword())) { + throw new ServiceException("钥匙领取人2密码错误"); + } + if(StringUtils.isEmpty(form.getFfrmm()) || !SecurityUtils.matchesPassword(form.getFfrmm(),ffr1.getPassword())) { + throw new ServiceException("发放人密码错误"); + } Zcg zcg = zcgService.getById(form.getZcgId()); if (zcg == null) { @@ -569,18 +575,26 @@ public class GspServiceImpl extends ServiceImpl implements IGspS public void ff(FfGspForm form) { //验证领取人1、领取人2、发放人1、发放人2密码 SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); - sysUserService.checkPassword(lqr1, form.getLqr1mm(), true); + if(StringUtils.isEmpty(form.getLqr1mm()) || !SecurityUtils.matchesPassword(form.getLqr1mm(),lqr1.getPassword())) { + throw new ServiceException("领取人1密码错误"); + } SysUser lqr2 = null; if(form.getLqr2Id() != null) { lqr2 = sysUserService.selectUserById(form.getLqr2Id()); - sysUserService.checkPassword(lqr2, form.getLqr2mm(), true); + if(StringUtils.isEmpty(form.getLqr2mm()) || !SecurityUtils.matchesPassword(form.getLqr2mm(),lqr2.getPassword())) { + throw new ServiceException("领取人2密码错误"); + } } SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); - sysUserService.checkPassword(ffr1, form.getFfr1mm(), true); + if(StringUtils.isEmpty(form.getFfr1mm()) || !SecurityUtils.matchesPassword(form.getFfr1mm(),ffr1.getPassword())) { + throw new ServiceException("发放人1密码错误"); + } SysUser ffr2 = null; if(form.getFfr2Id() != null) { ffr2 = sysUserService.selectUserById(form.getFfr2Id()); - sysUserService.checkPassword(ffr2, form.getFfr2mm(), true); + if(StringUtils.isEmpty(form.getFfr2mm()) || !SecurityUtils.matchesPassword(form.getFfr2mm(),ffr2.getPassword())) { + throw new ServiceException("发放人2密码错误"); + } } if (form.getId() == null || form.getId().longValue() < 0) { @@ -1265,18 +1279,26 @@ public class GspServiceImpl extends ServiceImpl implements IGspS @Transactional(rollbackFor = Exception.class) public void gh(GspGhForm form) { SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id()); - sysUserService.checkPassword(ghr1, form.getGhr1mm(), true); + if(StringUtils.isEmpty(form.getGhr1mm()) || !SecurityUtils.matchesPassword(form.getGhr1mm(),ghr1.getPassword())) { + throw new ServiceException("归还人1密码错误"); + } SysUser ghr2 = null; if(form.getGhr2Id() != null) { ghr2 = sysUserService.selectUserById(form.getGhr2Id()); - sysUserService.checkPassword(ghr2, form.getGhr2mm(), true); + if(StringUtils.isEmpty(form.getGhr2mm()) || !SecurityUtils.matchesPassword(form.getGhr2mm(),ghr2.getPassword())) { + throw new ServiceException("归还人2密码错误"); + } } SysUser jsr1 = sysUserService.selectUserById(form.getJsr1Id()); - sysUserService.checkPassword(jsr1, form.getJsr1mm(), true); + if(StringUtils.isEmpty(form.getJsr1mm()) || !SecurityUtils.matchesPassword(form.getJsr1mm(),jsr1.getPassword())) { + throw new ServiceException("库管员1密码错误"); + } SysUser jsr2 = null; if(form.getJsr2Id() != null) { jsr2 = sysUserService.selectUserById(form.getJsr2Id()); - sysUserService.checkPassword(jsr2, form.getJsr2mm(), true); + if(StringUtils.isEmpty(form.getJsr2mm()) || !SecurityUtils.matchesPassword(form.getJsr2mm(),jsr2.getPassword())) { + throw new ServiceException("库管员2密码错误"); + } } if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java index 48a0a6f..2d5750a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java @@ -657,7 +657,7 @@ public class SysUserServiceImpl implements ISysUserService @Override public Boolean checkPassword(SysUser user, String password, Boolean needName) { if ("dev".equals(activeProfile)){ - if(SecurityUtils.matchesPassword(password,user.getPassword())){ + if(StringUtils.isNotEmpty(password) && SecurityUtils.matchesPassword(password,user.getPassword())){ return true; } throw new ServiceException((needName?user.getNickName():"")+"密码错误");