From 81aee35c43bf9843b5bb3fc3c30ad34f2df89278 Mon Sep 17 00:00:00 2001 From: liriming <1343021927@qq.com> Date: 星期五, 25 四月 2025 15:58:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceConfServiceImpl.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceConfServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceConfServiceImpl.java index 830f1ce..99c04f3 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceConfServiceImpl.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceConfServiceImpl.java @@ -4,9 +4,12 @@ import com.iailab.module.ansteel.coking.dao.CokingTraceConfDao; import com.iailab.module.ansteel.coking.entity.CokingTraceConfEntity; import com.iailab.module.ansteel.coking.service.CokingTraceConfService; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -24,6 +27,15 @@ @Override public List<CokingTraceConfEntity> list(Map<String, Object> params) { - return cokingTraceConfDao.selectList(new QueryWrapper<>()); + String indType = (String) params.get("indType"); + String ext1 = (String) params.get("ext1"); + if (StringUtils.isBlank(indType)) { + return new ArrayList<>(); + } + + QueryWrapper<CokingTraceConfEntity> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ind_type", indType) + .eq(StringUtils.isNotBlank(ext1),"ext1", ext1); + return cokingTraceConfDao.selectList(queryWrapper); } } \ No newline at end of file -- Gitblit v1.9.3