Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

jiangping

2024-06-25 c0367b08c77c92377b2b94570019570dc3513507

 server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java

@@ -114,7 +114,7 @@
        queryWrapper.selectAll(Notices.class);
        queryWrapper.selectAs(Company::getName,Notices::getCompanyName);
        queryWrapper.leftJoin(Company.class,Company::getId,Notices::getCompanyId);
        queryWrapper.eq(Notices::getType, Constants.NoticeType.SIX.getStatus());
        queryWrapper.ne(Notices::getType, Constants.NoticeType.SIX.getStatus());
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.eq(Notices::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }