From dd6aa8efbcbf8cfbbb027573d207b528c09892df Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 28 Jul 2022 15:51:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=81=94=E5=BB=BA=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E8=B4=9F=E8=B4=A3=E4=BA=BA=E3=80=81=E7=A4=BE=E5=8C=BA?=
 =?UTF-8?q?=E8=87=AA=E7=BB=84=E7=BB=87=E8=B4=9F=E8=B4=A3=E4=BA=BA=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E9=BB=98=E8=AE=A4=E8=A7=92=E8=89=B2=E4=B8=8D=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/GovRoleDTO.java            | 5 +++++
 .../src/main/java/com/epmet/entity/GovRoleEntity.java      | 5 +++++
 .../java/com/epmet/service/impl/GovRoleServiceImpl.java    | 7 +++++++
 3 files changed, 17 insertions(+)

diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java
index f4b7ce74e9..0915ba9348 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java
@@ -60,6 +60,11 @@ public class GovRoleDTO implements Serializable {
      */
 	private Long deptId;
 
+	/**
+	 * 是否默认角色【0:否  1:是】
+	 */
+	private String defaultRole;
+
 	/**
 	 * 删除标识：0.未删除 1.已删除
 	 */
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java
index 654bee9ce6..7db443d5db 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java
@@ -46,4 +46,9 @@ public class GovRoleEntity extends BaseEpmetEntity {
 	 */
 	private String customerId;
 
+	/**
+	 * 是否默认角色【0:否  1:是】
+	 */
+	private String defaultRole;
+
 }
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java
index c171d081d9..be20a94427 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java
@@ -22,6 +22,8 @@ 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.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
@@ -116,6 +118,11 @@ public class GovRoleServiceImpl extends BaseServiceImpl<GovRoleDao, GovRoleEntit
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
+        //联建单位负责人、社区自组织负责人两个默认解释不允许删除
+        GovRoleEntity entity = baseDao.selectById(ids[0]);
+        if(null!=entity && "1".equals(entity.getDefaultRole())){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "系统默认角色，不允许删除", "系统默认角色，不允许删除");
+        }
         baseDao.deleteBatchIds(Arrays.asList(ids));
 
         govRoleMenuService.deleteByRoleIds(ids);