Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-15 e407181755cbed91d8f94c808caa8ee1685a8e24

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

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

@@ -95,7 +95,7 @@
    public TableDataInfo<TransactionEvent> selectConfigList(@RequestParam(value = "DepartmentId",required = false) String  DepartmentId,
                                          @CurrentUser SysUser sysUser)
    {
        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        List<String> ids=iOrganizationChartService.getIds(DepartmentId);
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,ids);
        int num=iTransactionEventService.countNum(null,null,ids);
        return getDataTable(list,num);