From 6873ee2b98283d9a876dfc6e5d878094e5de61d9 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 20 一月 2021 11:30:46 +0800
Subject: [PATCH] 系统配置
---
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml | 12 ++++++++++--
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java | 4 +++-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
index bc1cebf..7d8d885 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -24,7 +24,6 @@
<component name="ChangeListManager">
<list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -404,7 +403,7 @@
<workItem from="1610934956567" duration="1325000" />
<workItem from="1610939265133" duration="8588000" />
<workItem from="1610956684718" duration="7037000" />
- <workItem from="1611019208339" duration="31106000" />
+ <workItem from="1611019208339" duration="32090000" />
</task>
<servers />
</component>
@@ -550,6 +549,15 @@
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1610961524558" />
</component>
<component name="XDebuggerManager">
+ <breakpoint-manager>
+ <breakpoints>
+ <line-breakpoint enabled="true" type="java-line">
+ <url>file://$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java</url>
+ <line>137</line>
+ <option name="timeStamp" value="13" />
+ </line-breakpoint>
+ </breakpoints>
+ </breakpoint-manager>
<pin-to-top-manager>
<pinned-members>
<PinnedItemInfo parentTag="com.panzhihua.common.model.vos.R" memberName="data" />
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java
index 16a1d24..a598a7f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java
@@ -135,7 +135,9 @@
buildTypdIds.forEach(aLong -> {
if (!collect.contains(aLong)) {
ComMngStructBuildTypeDO comMngStructBuildTypeDO = comMngStructBuildTypeDAO.selectById(aLong);
- throw new ServiceException(comMngStructBuildTypeDO.getName()+"已经在使用无法删除");
+ if (!ObjectUtils.isEmpty(comMngStructBuildTypeDO)) {
+ throw new ServiceException(comMngStructBuildTypeDO.getName()+"已经在使用无法删除");
+ }
}
});
comMngStructBuildTypeDAO.delete(new QueryWrapper<ComMngStructBuildTypeDO>().lambda().eq(ComMngStructBuildTypeDO::getCommunityId, communityId));
--
Gitblit v1.7.1