Эх сурвалжийг харах

fix: 修复字段返回结果

huangzqa 2 жил өмнө
parent
commit
fc81a6b1e8

+ 1 - 1
dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/sub/IAppDataItemInfoFacade.java

@@ -37,6 +37,6 @@ public interface IAppDataItemInfoFacade {
      * @return 数据项信息
      */
     @GetMapping("selectByTableId")
-    AppDataItemInfoRespVO selectByTableId(@RequestParam("tableId") String tableId);
+    List<AppDataItemInfoRespVO> selectByTableId(@RequestParam("tableId") String tableId);
 
 }

+ 10 - 11
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/sub/AppDataItemInfoFacade.java

@@ -33,6 +33,16 @@ public class AppDataItemInfoFacade implements IAppDataItemInfoFacade {
     @Override
     public List<AppDataItemInfoRespVO> searchList(SearchDTO searchDTO) {
         List<AppDataItemInfo> dataItemInfoList = appDataItemInfoService.searchList(Searchable.toSearchable(searchDTO));
+        return toRespVOList(dataItemInfoList);
+    }
+
+    @Override
+    public List<AppDataItemInfoRespVO> selectByTableId(String tableId) {
+        List<AppDataItemInfo> dataItemInfoList = appDataItemInfoService.selectByTableId(tableId);
+        return toRespVOList(dataItemInfoList);
+    }
+
+    private List<AppDataItemInfoRespVO> toRespVOList(List<AppDataItemInfo> dataItemInfoList) {
         List<AppDataItemInfoRespVO> respVOList = new ArrayList<>(dataItemInfoList.size());
         for (AppDataItemInfo appDataItemInfo : dataItemInfoList) {
             AppDataItemInfoRespVO respVO = new AppDataItemInfoRespVO();
@@ -41,15 +51,4 @@ public class AppDataItemInfoFacade implements IAppDataItemInfoFacade {
         }
         return respVOList;
     }
-
-    @Override
-    public AppDataItemInfoRespVO selectByTableId(String tableId) {
-        AppDataItemInfo appDataItemInfo = appDataItemInfoService.selectByTableId(tableId);
-        if (appDataItemInfo == null) {
-            return null;
-        }
-        AppDataItemInfoRespVO respVO = new AppDataItemInfoRespVO();
-        BeanUtil.copyProperties(appDataItemInfo, respVO);
-        return respVO;
-    }
 }

+ 1 - 1
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/IAppDataItemInfoService.java

@@ -62,6 +62,6 @@ public interface IAppDataItemInfoService {
      * @param tableId 表ID
      * @return 数据项信息
      */
-    AppDataItemInfo selectByTableId(String tableId);
+    List<AppDataItemInfo> selectByTableId(String tableId);
 
 }

+ 2 - 2
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/sub/impl/AppDataItemInfoServiceImpl.java

@@ -64,9 +64,9 @@ public class AppDataItemInfoServiceImpl implements IAppDataItemInfoService {
     }
 
     @Override
-    public AppDataItemInfo selectByTableId(String tableId) {
+    public List<AppDataItemInfo> selectByTableId(String tableId) {
         LambdaQueryWrapper<AppDataItemInfo> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(AppDataItemInfo::getResourceTableId, tableId);
-        return appDataItemInfoMapper.selectOne(lambdaQueryWrapper);
+        return appDataItemInfoMapper.selectList(lambdaQueryWrapper);
     }
 }