提交一把

jiangping

2024-06-20 09da100729793848bc01b51f7b05ca3f1e7ec64f

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

@@ -101,7 +101,7 @@
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        //企业人员查看本企业数据
        if(loginUserInfo.getType().equals(Constants.ONE)){
        if(loginUserInfo.getType().equals(Constants.ONE)||loginUserInfo.getType().equals(Constants.TWO)){
            queryWrapper.eq(Notices::getCompanyId, loginUserInfo.getCompanyId());
        }else{
            if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
@@ -114,6 +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());
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.eq(Notices::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
@@ -145,7 +146,12 @@
                queryWrapper.in(Notices::getObjType,new Integer[]{Constants.NoticeObjectType.TAXES.getKey() });
            } else if(pageWrap.getModel().getQueryType().equals(Constants.TWO)){
                queryWrapper.in(Notices::getObjType,new Integer[]{Constants.NoticeObjectType.SETTLE_CLAIMS.getKey() });

            }else if(pageWrap.getModel().getQueryType().equals(Constants.THREE)){
                //委托保代办
                queryWrapper.notIn(Notices::getType,new Integer[]{Constants.NoticeType.SEVEN.getStatus() });
            }else if(pageWrap.getModel().getQueryType().equals(Constants.FOUR)){
                //委托保代办
                queryWrapper.in(Notices::getType,new Integer[]{Constants.NoticeType.SEVEN.getStatus() });
            }
        }
        if(CollectionUtils.isNotEmpty(pageWrap.getSorts())){