diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 7b2336b1b..8bffda745 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ZipUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -7407,15 +7408,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl queryDutyTerritory(String paramsManifestId) { - Map resMap = new HashMap<>(); List dtList = paramsCollectManifestEOMapper.queryDutyTerritory(paramsManifestId); List dtSdiList = sysDictItemService.selectItemsByDictCode("duty_territory"); Map dictItemsMap = dtSdiList.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); + JSONArray resList = new JSONArray(); if(ObjectUtils.isNotEmpty(dtList)){ for (String dtId : dtList) { - resMap.put(dtId,dictItemsMap.get(dtId)); + JSONObject dt = new JSONObject(); + dt.put("key",dtId); + dt.put("value",dictItemsMap.get(dtId)); + resList.add(dt); } } - return Result.OK(resMap); + return Result.OK(resList); } }