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/controller/ActivitiController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/ActivitiController.java b/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
index eb66c9e..1421175 100644
--- a/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
+++ b/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
@@ -213,6 +213,15 @@
} else {
type = ActivitiBusinessType.valueOf(businessType);
}
+
+ if (type.equals(ActivitiBusinessType.maintain)) {
+ Maintain maintain = maintainService.selectById(businessId);
+ boolean canStart = maintainService.getCanAct(maintain.getTableName());
+ if (!canStart) {
+ return Result.error(CodeMsg.ACT_RUN_ERROR);
+ }
+ }
+
Object descObj = variableMap.get("desc");
String desc;
if (descObj == null) {
@@ -498,4 +507,12 @@
return identityService.deleteUser(userId);
}
+
+ @RequestMapping(value = "/test")
+ public Result test(@RequestParam String roleId, @RequestParam String roleId2, @RequestParam String userId) {
+ identityService.deleteUserRole(roleId, userId);
+ identityService.addUserRole(roleId, userId);
+ identityService.deleteUserRole(roleId2, userId);
+ return identityService.addUserRole(roleId2, userId);
+ }
}
--
Gitblit v1.8.0