1 rok temu
rodzic
commit
47b64ef53f

+ 11 - 1
platform-service/src/main/java/com/platform/service/sbUnused/impl/SbUnusedServiceImpl.java

@@ -164,7 +164,17 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
     @Override
     public AbstractPageResultBean<SbUnusedVO> selectPageList(SbUnusedDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
+        List<SbUnusedVO> sbUnusedVOS = mapper.selectList(record);
+        List<SbUnusedDetailVO> sbUnusedDetailVOS = sbUnusedDetailMapper.selectList(null);
+        for (SbUnusedVO vo:sbUnusedVOS){
+            List<SbUnusedDetailVO> detailVOS = new ArrayList<>();
+            for (SbUnusedDetailVO detailVO:sbUnusedDetailVOS){
+                if (detailVO.getSbUnusedId().equals(vo.getId())){
+                    detailVOS.add(detailVO);
+                }
+            }
+        }
+        return new MyPage(sbUnusedVOS);
     }
 
     @Override