From e9307b95e6b8e842dd3ba36705dada554001d900 Mon Sep 17 00:00:00 2001 From: kilo Date: Thu, 14 Sep 2023 16:02:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=9C=8D=E5=8A=A1=E9=A1=B9nu?= =?UTF-8?q?ll=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionReservationWrapper.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionReservationWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionReservationWrapper.java index af354c240..e7ce6ee04 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionReservationWrapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionReservationWrapper.java @@ -5,6 +5,7 @@ import com.logpm.distribution.vo.DistributionReservationVO; import org.springblade.common.constant.DictBizConstant; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.core.tool.utils.Func; import org.springblade.system.cache.DictBizCache; import java.util.Objects; @@ -29,17 +30,20 @@ public class DistributionReservationWrapper extends BaseEntityWrapper0){ - String[] split = serveType.split(","); - for (String s : split) { - String value = DictBizCache.getValue(DictBizConstant.ADD_VALUE_SERVE_TYPE, s); - builder.append(value).append(","); + + if (Func.isNotEmpty(serveType)){ + if (serveType.indexOf(",")>0){ + String[] split = serveType.split(","); + for (String s : split) { + String value = DictBizCache.getValue(DictBizConstant.ADD_VALUE_SERVE_TYPE, s); + builder.append(value).append(","); + } + }else { + builder.append(DictBizCache.getValue(DictBizConstant.ADD_VALUE_SERVE_TYPE,serveType)).append(","); } - }else { - builder.append(DictBizCache.getValue(DictBizConstant.ADD_VALUE_SERVE_TYPE,serveType)).append(","); + reservationVO.setServeTypeName(builder.deleteCharAt(builder.length()-1).toString()); } - reservationVO.setServeTypeName(builder.deleteCharAt(builder.length()-1).toString()); reservationVO.setDeliveryWayName(DictBizCache.getValue(DictBizConstant.DELIVERY_WAY,entity.getDeliveryWay())); reservationVO.setDeliveryTypeName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE,entity.getDeliveryType())); reservationVO.setReservationStatusName(DictBizCache.getValue(DictBizConstant.RESERVATION_STATUS,entity.getReservationStatus()));