Merge remote-tracking branch 'origin/master'

jiangping

2024-10-22 168c5450e3493852059da54d698d08c2269b91fc

 server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java

@@ -168,7 +168,7 @@
            queryWrapper.eq(Notices::getUserId, noticesDTO.getMemberId());
            queryWrapper.eq(Notices::getSendacopy,Constants.ONE);
            if(Objects.nonNull(noticesDTO.getNoRead())&&Constants.equalsInteger(noticesDTO.getNoRead(),Constants.ONE)){
                queryWrapper.eq(Notices::getReaded,Constants.ONE);
                queryWrapper.eq(Notices::getReaded,Constants.ZERO);
            }
        }else{
            queryWrapper.eq("1","2");