From 1df722e049a36363ac9c0cc0658920d68f7b78ca Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期二, 11 七月 2023 19:29:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java index 0999276..c297a3c 100644 --- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java @@ -1,10 +1,12 @@ package com.vci.ubcs.omd.service.impl; import com.alibaba.cloud.commons.lang.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.vci.ubcs.omd.constant.BtmTypeConstant; +import com.vci.ubcs.omd.entity.LifeCycleRule; import com.vci.ubcs.omd.entity.Status; import com.vci.ubcs.omd.mapper.StatusMapper; import com.vci.ubcs.omd.service.IStatusService; @@ -196,7 +198,10 @@ Collection<Collection<String>> idCollections = VciBaseUtil.switchCollectionForOracleIn(idCollection); if(!CollectionUtils.isEmpty(idCollections)) { idCollections.forEach(s -> { - List<Status> queryResult = baseMapper.selectByIdIgnoreCase(s); + QueryWrapper<Status> wrapper = new QueryWrapper<>(); + wrapper.in("id",s); + List<Status> queryResult = baseMapper.selectList(wrapper); + if(!CollectionUtils.isEmpty(queryResult)){ statusDOList.addAll(queryResult); } -- Gitblit v1.9.3