From 0d831f835708bab1351fa26c7e8aea0a9bf8911e Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 01 四月 2020 11:38:30 +0800
Subject: [PATCH] add usergroup 一半
---
src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java b/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java
index 91d67ef..836c308 100644
--- a/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java
@@ -156,29 +156,29 @@
.eq(Constant.TYPE, type)
.eq(character_id, characterId)
.eq("menu_id", menuId);
+ Wrapper<MasterAuthor> menuWrapper = new EntityWrapper<MasterAuthor>()
+ .eq(Constant.TYPE, type)
+ .eq(character_id, characterId)
+ .eq("menu_id", menuId);
if (!StringUtils.isEmpty(maintainFieldId)) {
masterAuthorWrapper.eq(this.maintain_field_id, maintainFieldId);
}
-
- List<MasterAuthor> masterAuthorList = authorService.selectList(masterAuthorWrapper);
- if (masterAuthorList.isEmpty()) {
+ int count = authorService.selectCount(menuWrapper);
+ boolean only = false;
+ if (count == 1 && !StringUtils.isEmpty(maintainFieldId)) {
+ only = true;
+ }
+ MasterAuthor masterAuthor = authorService.selectOne(masterAuthorWrapper);
+ if (masterAuthor == null) {
return Result.success(null);
}
- boolean partDel = false;
- if (masterAuthorList.size() == 1 && !StringUtils.isEmpty(maintainFieldId)) {
- // 鍙湁涓�涓笖鍒犻櫎 瀛楁鐗堟湰 淇濈暀鏈潯
- partDel = true;
- }
- boolean delete = false;
- for (MasterAuthor masterAuthor : masterAuthorList) {
- delete = authorDetailService.delete(new EntityWrapper<MasterAuthorDetail>().eq(Constant.PARENT_ID, masterAuthor.getId()));
- if (delete) {
- if (partDel) {
- delete = masterAuthor.setMaintainFieldId(null).updateById();
- }else {
- delete = masterAuthor.deleteById();
- }
+ boolean delete = authorDetailService.delete(new EntityWrapper<MasterAuthorDetail>().eq(Constant.PARENT_ID, masterAuthor.getId()));
+ if (delete) {
+ if (only){
+ delete = masterAuthor.setMaintainFieldId(null).setFieldAuto(false).setMaintainAuto(false).setUpdateTime(new Date()).updateById();
+ }else {
+ delete = masterAuthor.deleteById();
}
}
--
Gitblit v1.8.0