lidongdong
2022-11-21 40874ba639745413d256a555f8d1a7014c15fb6c
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;
        if (departmentId!=null){
        int num;
        if (departmentId!=null&&departmentId.length()>0){
            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);
    }
@@ -108,6 +111,10 @@
    public TableDataInfo<TransactionEvent> selectConfigList(@RequestBody List<String> DepartmentId,
                                          @CurrentUser SysUser sysUser)
    {
        if(DepartmentId==null||DepartmentId.size()<1)
        {
            DepartmentId=null;
        }
//        List<String> ids=iOrganizationChartService.getIds(DepartmentId);
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,DepartmentId);
        int num=iTransactionEventService.countNum(null,null,DepartmentId);