feat: 欢迎语关联详情不展示链接状态

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmWelcomeRelationApiServiceImpl.java

@@ -50,15 +50,16 @@ public class HmWelcomeRelationApiServiceImpl implements HmWelcomeRelationApiServ
         welcomeRelationQo.setPageSize(queryWelcomeRelationQdto.getPageSize());
         Page<HmWelcomeRelationBO> welcomeRelationPage = welcomeRelationService.queryWelcomeRelationPage(welcomeRelationQo);
         Page<HmWelcomeRelationDTO> welcomeRelationDTOPage = PageUtil.changeToCurrentPage(welcomeRelationPage, HmWelcomeRelationDTO.class);
-        List<HmWelcomeRelationBO> result = welcomeRelationPage.getResult();
-        if (CollectionUtils.isEmpty(result)){
-            for (HmWelcomeRelationBO welcomeRelationBO : result) {
+        List<HmWelcomeRelationDTO> result = welcomeRelationDTOPage.getResult();
+        if (!CollectionUtils.isEmpty(result)){
+            for (HmWelcomeRelationDTO welcomeRelationBO : result) {
                 if (HmWelcomeReferType.LINK.getCode().equals(welcomeRelationBO.getType())){
                     // 链接状态不展示
                     welcomeRelationBO.setStatus(null);
                 }
             }
         }
+        welcomeRelationDTOPage.setResult(result);
         return ServiceResponse.success(welcomeRelationDTOPage);
     }
 }

haoban-manage3-service/src/test/java/HmPageServiceTest.java

@@ -129,7 +129,7 @@ public class HmPageServiceTest {
     @Test
     public void welcomeTest(){
         QueryWelcomeRelationQDTO qdto = new QueryWelcomeRelationQDTO();
-        qdto.setWelcomeId("04af9e55515d4352be0b2a3119005ce9");
+        qdto.setWelcomeId("7f12bdab4fb543e8977f96e30fc8eddb");
         //qdto.setSearchContent("测试");
         ServiceResponse<Page<HmWelcomeRelationDTO>> serviceResponse = welcomeRelationApiService.queryWelcomeRelation(qdto);
         System.out.println(JSON.toJSONString(serviceResponse));