Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemFireHazardsNoticeServiceImpl.java

@@ -41,7 +41,8 @@ public class DemFireHazardsNoticeServiceImpl extends AbstractCrudService<DemFire
         LambdaQueryWrapper<DemFireHazardsNotice> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DemFireHazardsNotice::getUserDesignId,DemFireHazardsNotice::getCompanyName,
                 DemFireHazardsNotice::getCheckTime,DemFireHazardsNotice::getOrderCorrectTime,
-                DemFireHazardsNotice::getContent,DemFireHazardsNotice::getBookNum);
+                DemFireHazardsNotice::getContent,DemFireHazardsNotice::getBookNum)
+                .eq(DemFireHazardsNotice::getDeleteFlag,0);
         page = this.page(page, queryWrapper);
         if (page.getTotal() > 0) {
             LambdaQueryWrapper<DemFireHazardsCancellation> queryWrapper1 = Wrappers.lambdaQuery();