merge

luodangjia

2024-12-28 cf49f4f936a11b27de3f9ec3cbb50603f3b1cd5b

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

@@ -41,7 +41,7 @@
     */
    @Override
    public DisposalRecordStaticsVO statics(MwDisposalRecordQuery query) {
        String treeCode = sysDepartmentService.getTreeCode(query.getDepartmentId());
        String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
        if (StringUtils.isNotBlank(treeCode)) {
            List<MwDisposalRecordVO> disposalRecordVOList = baseMapper.getStaticsData(query, treeCode);
            if (CollUtils.isNotEmpty(disposalRecordVOList)) {
@@ -65,7 +65,7 @@
     */
    @Override
    public PageDTO<MwDisposalRecordVO> pageList(MwDisposalRecordQuery query) {
        String treeCode = sysDepartmentService.getTreeCode(query.getDepartmentId());
        String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
        if (StringUtils.isBlank(treeCode)) {
            return PageDTO.empty(0L, 0L);
        }