添加远程调试

sample-form-manager/pom.xml

@@ -45,6 +45,7 @@
             <id>test</id>
             <properties>
                 <profiles.active>test</profiles.active>
+                <profiles.server.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5520</profiles.server.debug>
                 <profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
                 <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
                 <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -281,15 +281,10 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
     @Override
     protected void findAfter(MatterDatumEntity params, PageInfo pageInfo, Context context, List<MatterDatumEntity> list) throws AppException {
         List<Long> matterIdList = list.stream().map(item -> item.getMatterId()).collect(Collectors.toList());
+        if(ObjectUtils.isEmpty(matterIdList)){
             MatterQuery matterQuery = new MatterQuery();
             matterQuery.setIdList(matterIdList);
             Map<Long, MatterEntity> matterEntityMap = matterService.find(matterQuery).stream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
-
-
-        List<Long> materialIdList = list.stream().map(item -> item.getId()).collect(Collectors.toList());
-        DatumCategoryQuery datumCategoryQuery = new DatumCategoryQuery();
-        datumCategoryQuery.setMaterialIdList(materialIdList);
-        Map<Long, DatumCategoryEntity> collect = datumCategoryService.find(datumCategoryQuery).stream().collect(Collectors.toMap(x -> x.getMaterialId(), y -> y, (o, n) -> n));
             list.stream().forEach(entity -> {
                 if (!ObjectUtils.isEmpty(matterEntityMap)) {
                     MatterEntity matterEntity = matterEntityMap.get(entity.getMatterId());
@@ -298,6 +293,16 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
                         entity.setMatterName(matterEntity.getMatterName());
                     }
                 }
+            });
+        }
+
+        List<Long> materialIdList = list.stream().map(item -> item.getId()).collect(Collectors.toList());
+        if(!ObjectUtils.isEmpty(materialIdList)){
+            DatumCategoryQuery datumCategoryQuery = new DatumCategoryQuery();
+            datumCategoryQuery.setMaterialIdList(materialIdList);
+            Map<Long, DatumCategoryEntity> collect = datumCategoryService.find(datumCategoryQuery).stream().collect(Collectors.toMap(x -> x.getMaterialId(), y -> y, (o, n) -> n));
+            list.stream().forEach(entity -> {
+
                 if (!ObjectUtils.isEmpty(collect)) {
                     DatumCategoryEntity datumCategoryEntity = collect.get(entity.getCategoryId());
                     if (!ObjectUtils.isEmpty(datumCategoryEntity)) {
@@ -306,6 +311,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
                     }
                 }
             });
+        }
         super.findAfter(params, pageInfo, context, list);
     }