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

张天森

2022-10-18 47b8d29b211c1a3644955ef768d01d2985a25dfc

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

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

        String id=iTransactionEventService.selectDataIfExist(entity.getDepartmentId(),entity.getMatterName());
        if(!StringUtils.isEmpty(id))
        {
            return ResultData.error("事件名称已存在");
        }


        return toAjax(iTransactionEventService.updateConfig(entity));
    }
@@ -242,4 +238,5 @@

    }


}