Merge remote-tracking branch 'origin/master'

jiangping

2025-07-01 e02c14b53ecda4912fc93c7f83b1dcb4bb7a3999

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyDocumentsServiceImpl.java

@@ -10,6 +10,7 @@
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyDocuments;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CompanyDocumentsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -120,7 +121,7 @@
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(StringUtils.isNotBlank(companyDocuments.getFileurl())){
            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.COMPANY_DOCUMENTS).getCode();
            companyDocuments.setFileurlFull(path + companyDocuments.getFileurl());
        }
@@ -148,8 +149,10 @@
        queryWrapper.selectAll(CompanyDocuments.class)
                .selectAs(Company::getName,CompanyDocuments::getCompanyName)
                .selectAs(Category::getName,CompanyDocuments::getCategoryName)
                .selectAs(SystemUser::getRealname,CompanyDocuments::getCreatorName)
                .leftJoin(Company.class,Company::getId,CompanyDocuments::getCompanyId)
                .leftJoin(Category.class,Category::getId,CompanyDocuments::getCategoryId)
                .leftJoin(SystemUser.class,SystemUser::getId,CompanyDocuments::getCreator)
                .eq(CompanyDocuments::getIsdeleted,Constants.ZERO)
                .like(Objects.nonNull(queryModel)&&StringUtils.isNotBlank(queryModel.getName()),CompanyDocuments::getName,queryModel.getName())
                .eq(Objects.nonNull(queryModel)&&Objects.nonNull(queryModel.getCategoryId()),CompanyDocuments::getCategoryId,queryModel.getCategoryId())
@@ -157,7 +160,7 @@
                .orderByDesc(CompanyDocuments::getSortnum)
                .orderByDesc(CompanyDocuments::getCreateDate);
        IPage<CompanyDocuments> iPage = companyDocumentsMapper.selectJoinPage(page, CompanyDocuments.class,queryWrapper);
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.COMPANY_DOCUMENTS).getCode();
        for (CompanyDocuments companyDocuments:iPage.getRecords()) {
            companyDocuments.setFileurlFull(path + companyDocuments.getFileurl());