From c8aee7b9bfd79cfd741d7e5692520f4f51a31a86 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期一, 18 五月 2020 18:30:01 +0800
Subject: [PATCH] bak 修改 获取版本数据前
---
src/main/java/com/highdatas/mdm/controller/SysViewController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/SysViewController.java b/src/main/java/com/highdatas/mdm/controller/SysViewController.java
index 9797310..9f4e973 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysViewController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysViewController.java
@@ -282,6 +282,7 @@
.setStatus(ViewStatus.edit)
.setEmptyData(true)
.insert();
+
viewService.getMappingTableName(sysView);
return Result.success(sysView);
}
@@ -318,7 +319,7 @@
for (String subField: subFieldList) {
String changeFieldName = viewService.changeFieldName(joinMaintain.getTableName(), subField);
- logicService.delete(new EntityWrapper<SysViewLogic>()
+ logicmapService.delete(new EntityWrapper<SysViewLogicmap>()
.eq(Constant.PARENT_ID, sysView.getId())
.eq(Constant.FIELD, changeFieldName)
);
@@ -369,13 +370,18 @@
if (StringUtils.isEmpty(view.getMenuId()) || StringUtils.isEmpty(view.getBaseMaintain()) ) {
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
}
+ if (StringUtils.isEmpty(view.getViewTableName())) {
+ viewService.getViewTableName(view);
+ }
List<SysViewLogicmap> logicmapList = view.getLogicmapList();
logicmapService.delete(new EntityWrapper<SysViewLogicmap>().eq(Constant.PARENT_ID, view.getId()));
-
- for (SysViewLogicmap logicmap : logicmapList) {
- logicmap.setId(DbUtils.getUUID()).setParentId(view.getId()).insert();
+ if (logicmapList != null) {
+ for (SysViewLogicmap logicmap : logicmapList) {
+ logicmap.setId(DbUtils.getUUID()).setParentId(view.getId()).insert();
+ }
}
+
view.setEmptyData(false).setStatus(ViewStatus.edit);
//delete
sysViewJoinService.delete(new EntityWrapper<SysViewJoin>().eq(Constant.PARENT_ID, view.getId()));
--
Gitblit v1.8.0