Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-01 2dc478231fd09a88a4d86d44388ae807aca08bc5

 medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwProtectionRegulationServiceImpl.java

@@ -7,6 +7,7 @@
import com.sinata.common.exception.ServiceException;
import com.sinata.common.utils.BeanUtils;
import com.sinata.common.utils.CollUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwAttachment;
import com.sinata.system.domain.MwProtectionRegulation;
import com.sinata.system.domain.dto.MwProtectionRegulationDTO;
@@ -50,6 +51,9 @@
    @Override
    public PageDTO<MwProtectionRegulationVO> pageList(MwProtectionRegulationQuery query) {
        String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
        if (StringUtils.isBlank(treeCode)) {
            return PageDTO.empty(0L, 0L);
        }
        Page<MwProtectionRegulationVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
        return PageDTO.of(page);
    }