From 9058c4532bdcf3bfc6d3424bd23eba5f30088a6d Mon Sep 17 00:00:00 2001 From: lihao Date: Wed, 6 Aug 2025 08:36:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=87=E6=96=99=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mmpac/pickm/query/PickmByIdsQueryAction.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java b/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java index 194edc1..ba9c5d3 100644 --- a/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java +++ b/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java @@ -4,6 +4,7 @@ import nc.itf.mmpac.pickm.IPickmQueryService; import nc.util.mmf.framework.base.MMValueCheck; import nc.vo.ml.NCLangRes4VoTransl; import nc.vo.mmpac.pickm.entity.AggPickmVO; +import nc.vo.mmpac.pickm.entity.PickmHeadVO; import nc.vo.mmpac.pickm.entity.PickmItemVO; import nc.vo.mmpac.pickm.util.PickmSortUtil; import nccloud.dto.mmpac.pickm.pub.entity.PickmQueryInfoDTO; @@ -14,7 +15,9 @@ import nccloud.framework.web.action.itf.ICommonAction; import nccloud.framework.web.container.IRequest; import nccloud.framework.web.json.JsonFactory; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -35,14 +38,18 @@ public class PickmByIdsQueryAction implements ICommonAction { if (null == vos || vos.length == 0) { ExceptionUtils.wrapBusinessException(NCLangRes4VoTransl.getNCLangRes().getStrByID("5008100_0", "05008100-0005")); } + List pickmItemVOList =new ArrayList<>(); for (AggPickmVO vo : vos) { + PickmHeadVO headVO= vo.getParentVO(); PickmItemVO[] childrenVO = (PickmItemVO[]) vo.getChildrenVO(); - if (MMValueCheck.isNotEmpty(childrenVO)) { - vo.setChildrenVO(PickmSortUtil.sortItemsByRowNo(childrenVO)); + for (PickmItemVO child : childrenVO) { + + pickmItemVOList.add(child); } + } Map returnMap = new HashMap<>(); - returnMap.put("data", vos); + returnMap.put("data", pickmItemVOList); returnMap.put("success", true); return returnMap; } catch (Exception ex) {