From aea54666ef2ccb0a15b31c6c1a20cf81a43eb316 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 23 Apr 2020 15:47:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF-=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=9C=BA=E5=85=B3=E7=BB=84=E7=BB=87=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 3 ++- .../main/java/com/epmet/constant/CustomerAgencyConstant.java | 4 ---- .../com/epmet/service/impl/CustomerAgencyServiceImpl.java | 5 +++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 0ddc89d09b..d07777427a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -26,7 +26,8 @@ public enum EpmetErrorCode { MOBILE_GET_CODE_ERROR(8104,"获取验证码失败"), MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"), - CANNOT_AUDIT_WARM(8201, "请完善居民信息"); + CANNOT_AUDIT_WARM(8201, "请完善居民信息"), + NOT_DEL_AGENCY(8202, "该机关存在下级机关，不允许删除"); private int code; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java index 42d40b0199..3c28f465f9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java @@ -14,10 +14,6 @@ public interface CustomerAgencyConstant { * 添加组织失败 */ String SAVE_EXCEPTION = "组织机构新增失败"; - /** - * 不允许删除组织 - */ - String NOT_DEL_AGENCY = "当前组织存在下级组织，不允许删除"; /** * 组织删除失败 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 4d17f1a674..3bbd8631c0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; @@ -41,7 +42,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -188,7 +188,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyList = baseDao.selectSubAgencyById(formDTO.getAgencyId()); if (null != agencyList && agencyList.size() > NumConstant.ZERO) { - result.setMsg(CustomerAgencyConstant.NOT_DEL_AGENCY); + result.setCode(EpmetErrorCode.NOT_DEL_AGENCY.getCode()); + result.setMsg(EpmetErrorCode.NOT_DEL_AGENCY.getMsg()); return result; } //2:删除当前机关组织（逻辑删）