政府端-删除机关组织接口优化

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;

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 = "当前组织存在下级组织，不允许删除";
 	/**
 	 * 组织删除失败
 	 */

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<CustomerAgencyDao
         //1:查询当前机关是否存在所属下级机关，存在下级的不能删除
         List<SubListResultDTO> 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:删除当前机关组织（逻辑删）