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

张天森

2022-11-17 e8455c5c7d5b2ebd6022aa82f20b49c4f425016d

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

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

@@ -86,7 +86,7 @@
        Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
        List<TransactionEvent> list;
        int num;
        if (departmentId!=null){
        if (departmentId!=null&&departmentId.length()>0){
            List<String> ids=iOrganizationChartService.getDepartmentId(departmentId);
            list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
                    classifyGrade,ids);