修改Bug

fengjin

2022-11-17 9e370ecc344ff3383f5f4777b74e198757f6b116

修改Bug

 flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java

@@ -85,15 +85,18 @@
        Assert.notNull(pageSize, "pageSize 不能为空");
        Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
        List<TransactionEvent> list;
        int num;
        if (departmentId!=null){
            List<String> ids=iOrganizationChartService.getDepartmentId(departmentId);
            list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
                    classifyGrade,ids);
              num=iTransactionEventService.countNum(keyword,classifyGrade,ids);

        }else {
               list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
                classifyGrade,null);
              num=iTransactionEventService.countNum(keyword,classifyGrade,null);
        }
        int num=iTransactionEventService.countNum(keyword,classifyGrade,null);
        return getDataTable(list,num);
    }