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 | 19 ++++++++++---------
1 files changed, 10 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 ae336bf..d88c785 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/SysAssembleServiceImpl.java
@@ -86,6 +86,13 @@
ISysMenuService menuService;
@Autowired
IMasterAuthorSubscribeService subscribeService;
+ /**
+ *
+ * @description: 閫氳繃姹囬泦id鎵ц姹囬泦浠诲姟
+ * @param id 姹囬泦id
+ * @return: 鎵ц缁撴灉
+ *
+ */
@Override
public Result run(String id) {
XxlJobLogger.log("log info: run" );
@@ -128,15 +135,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();
@@ -601,6 +599,8 @@
private Result checkTempData(SysAssemble assemble) {
try {
+
+
SysAssembleCheckType checkType = assemble.getCheckType();
if (checkType == null) {
return Result.error(new CodeMsg(6009, "瑙勫垯鏍￠獙绫诲瀷涓虹┖"));
@@ -636,6 +636,7 @@
return Result.success(null);
} catch (Exception e) {
+ e.printStackTrace();
return Result.error(new CodeMsg(3009, e.getMessage()));
}
}
--
Gitblit v1.8.0