1.修改自动分配代码逻辑2.修改BUG

fengjin

2022-10-19 922a118ac36d64fd3d18a6d86e279800c92a5ccd

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

@@ -59,7 +59,7 @@
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "matterAndUser",required = false) String matterAndUser,
                                          @RequestParam(value = "keyword",required = false) String keyword,
                                          @RequestParam(value = "classifyGrade",required = false) String classifyGrade,
                                          @CurrentUser SysUser sysUser)
    {
@@ -67,9 +67,9 @@
        Assert.notNull(pageSize, "pageSize 不能为空");
        Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,matterAndUser,
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
                classifyGrade,ids);
        int num=iTransactionEventService.countNum(matterAndUser,classifyGrade,ids);
        int num=iTransactionEventService.countNum(keyword,classifyGrade,ids);
        return getDataTable(list,num);
    }

@@ -134,6 +134,8 @@
            return ResultData.error("事件名称不能为空");
        }



        return toAjax(iTransactionEventService.updateConfig(entity));
    }