From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001 From: kimi <kimi42345@gmail.com> Date: 星期三, 27 五月 2020 09:59:29 +0800 Subject: [PATCH] merage --- src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java index bcea10d..d88c785 100644 --- a/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java +++ b/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java @@ -137,15 +137,6 @@ } } - String tableNameByMenu = menuMappingService.getTableNameByMenu(assemble.getMenuId()); - boolean canAct = maintainService.getCanAct(tableNameByMenu); - if (!canAct) { - XxlJobLogger.log("褰撳墠鏈夋祦绋嬫鍦ㄨ繍琛�,鏆傛椂鏃犳硶姹囬泦涓嬫鏁版嵁"); - assemble.setPreMsg("褰撳墠鏈夋祦绋嬫鍦ㄨ繍琛�,鏆傛椂鏃犳硶姹囬泦涓嬫鏁版嵁"); - assemble.updateById(); - return Result.error(new CodeMsg(6009,"褰撳墠鏈夋祦绋嬫鍦ㄨ繍琛�,鏆傛椂鏃犳硶姹囬泦涓嬫鏁版嵁")); - } - Boolean bigData = assemble.getBigdata(); Date scheduleDate = new Date(); XxlJobLogger.log("log info: start assemble"); @@ -608,6 +599,8 @@ private Result checkTempData(SysAssemble assemble) { try { + + SysAssembleCheckType checkType = assemble.getCheckType(); if (checkType == null) { return Result.error(new CodeMsg(6009, "瑙勫垯鏍¢獙绫诲瀷涓虹┖")); -- Gitblit v1.8.0