From e8fcd659d99eb053835613eadfc894aedb12b9a3 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Thu, 18 Jun 2026 17:43:32 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dao/mapper/StructattrMapper.java | 3 ++- .../basedata_manage/service/dao/mapper/StructattrMapper.xml | 3 +++ .../basedata_manage/service/impl/StructattrServiceImpl.java | 2 +- .../service/logging/impl/SysLogServiceImpl.java | 6 +++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.java index 13cecf1..f4e3082 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.java @@ -2,6 +2,7 @@ package org.nl.wms.basedata_manage.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.basedata_manage.service.dao.StructattrVechielDto; @@ -17,6 +18,6 @@ public interface StructattrMapper extends BaseMapper{ List collectVehicle(Map query); - List getctnextcode(); + List getctnextcode(@Param("sect_code") String sectCode); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml index 4e1f4d5..1e588f5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml @@ -64,6 +64,9 @@ s.* FROM st_ivt_structattr s WHERE s.stor_type = '1' + + AND s.sect_code = #{sect_code} + AND s.storagevehicle_code IS NULL AND s.is_used = 1 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java index 5ace741..505ffb4 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java @@ -508,7 +508,7 @@ public class StructattrServiceImpl extends ServiceImpl list = this.list(query); //特殊载具规则 if ("BCPCTZB".equals(param.getStoragevehicle_type()) || "DJQCT".equals(param.getStoragevehicle_type())) { - list = structattrMapper.getctnextcode(); + list = structattrMapper.getctnextcode(param.getSect_code()); //只入234层 } else if ("DJQMZB".equals(param.getStoragevehicle_type())) { list.removeIf(r -> r.getLayer_num().equals(1)); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/impl/SysLogServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/impl/SysLogServiceImpl.java index dee5a21..8b55bdd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/impl/SysLogServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/impl/SysLogServiceImpl.java @@ -57,9 +57,13 @@ public class SysLogServiceImpl extends ServiceImpl impleme LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); lam.eq(ObjectUtil.isNotEmpty(log_type), SysLog::getLog_type, log_type) .eq(ObjectUtil.isNotEmpty(username), SysLog::getUsername, username) - .like(ObjectUtil.isNotEmpty(blurry), SysLog::getDescription, blurry) .le(ObjectUtil.isNotEmpty(end_time), SysLog::getCreate_time, end_time) .ge(ObjectUtil.isNotEmpty(begin_time), SysLog::getCreate_time, begin_time) + .and(wrapper -> { + wrapper.like(ObjectUtil.isNotEmpty(blurry), SysLog::getDescription, blurry) + .or() + .like(ObjectUtil.isNotEmpty(blurry), SysLog::getParams, blurry); + }) .orderByDesc(SysLog::getCreate_time); IPage page = new Page<>(pageable.getPage()+1, pageable.getSize()); logMapper.selectPage(page, lam);