From 82fbbf24939e150ee3cef90dc0dd843c9897a7e6 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期六, 23 五月 2020 12:27:13 +0800
Subject: [PATCH] 添加 log前 去除bak文件前的备份

---
 src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 833e89a..ae336bf 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java
@@ -130,6 +130,15 @@
             }
         }
 
+        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");
@@ -592,8 +601,6 @@
 
     private Result checkTempData(SysAssemble assemble) {
         try {
-
-
             SysAssembleCheckType checkType = assemble.getCheckType();
             if (checkType == null) {
                 return Result.error(new CodeMsg(6009, "瑙勫垯鏍¢獙绫诲瀷涓虹┖"));

--
Gitblit v1.8.0