From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期一, 25 三月 2024 10:59:40 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
index 044c8bc..c7ac66d 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
@@ -202,7 +202,7 @@
* @return
*/
@Override
- public ResultVO<List<EmergencySuppliesTypeRespDTO>> emergencySuppliesList(ContextCacheUser currentUser) {
+ public List<EmergencySuppliesTypeRespDTO> emergencySuppliesList(ContextCacheUser currentUser) {
List<EmergencySuppliesInfo> emergencySuppliesInfoList = emergencySuppliesInfoService.listByNoConditions();
List<EmergencySuppliesTypeRespDTO> typeRespDTOList = new ArrayList<>();
@@ -224,20 +224,20 @@
typeRespDTO.setList(respDTOList);
typeRespDTOList.add(typeRespDTO);
}
- return new ResultVO<>(ResultCodes.OK,typeRespDTOList);
+ return typeRespDTOList;
}
@Override
- public ResultVO<List<EmergencySuppliesRespDTO>> listCountByIds(ContextCacheUser currentUser, List<Long> ids) {
+ public List<EmergencySuppliesRespDTO> listCountByIds(ContextCacheUser currentUser, List<Long> ids) {
if(null == ids || ids.size() == 0 ){
- throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PRAM_NULL);
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_PARAM_NULL);
}
List<EmergencySuppliesInfo> emergencySuppliesInfos = emergencySuppliesInfoService.listCountByIds(ids);
List<EmergencySuppliesRespDTO> respDTOList = new ArrayList<>();
if(!CollectionUtils.isEmpty(emergencySuppliesInfos)){
respDTOList = BeanCopyUtils.copyBeanList(emergencySuppliesInfos,EmergencySuppliesRespDTO.class);
}
- return new ResultVO<>(ResultCodes.OK,respDTOList);
+ return respDTOList;
}
private void deleteEmergencySupplies(Long id) {
--
Gitblit v1.9.2