From 9c17111caae20d17b17e9d6f904e15a8ea14ae6b Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 6 Jan 2021 18:01:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E5=AE=A2=E6=88=B7=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=B2=E5=AD=98=E5=9C=A8=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/GovStaffRoleDao.java  |  2 ++
 .../epmet/service/impl/GovStaffRoleServiceImpl.java   | 11 ++++++++++-
 .../src/main/resources/mapper/GovStaffRoleDao.xml     |  6 ++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
index f7875d63d5..5992dfb720 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
@@ -77,4 +77,6 @@ public interface GovStaffRoleDao extends BaseDao<GovStaffRoleEntity> {
     int updateSortById(@Param("roleId") String roleId, @Param("sort") int sort);
 
     List<GovStaffRoleResultDTO> listRolesByRoleKey(@Param("roleKey") String roleKey);
+
+    Integer countRolesByCustomerId(@Param("customerId") String customerId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java
index 726be2370d..16c6a375e2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java
@@ -39,6 +39,8 @@ import com.epmet.feign.GovAccessFeignClient;
 import com.epmet.redis.GovStaffRoleRedis;
 import com.epmet.service.GovStaffRoleService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,6 +59,8 @@ import java.util.Map;
 @Service
 public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, GovStaffRoleEntity> implements GovStaffRoleService {
 
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
     @Autowired
     private GovStaffRoleRedis govStaffRoleRedis;
 
@@ -140,8 +144,13 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, Go
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void initGovStaffRolesForCustomer(String customerId) {
+        Integer rolesCount = baseDao.countRolesByCustomerId(customerId);
+        if (rolesCount > 0) {
+            logger.info("为客户初始化角色列表-该客户【客户ID:%s】已存在角色信息，无需再次初始化。", customerId);
+            return;
+        }
         // 增加角色列表
         List<GovStaffRoleTemplateDTO> validRoles = govStaffRoleTemplateDao.listValidateRoles();
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
index 40539c565f..87a5fc01e7 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
@@ -111,4 +111,10 @@
         where gsr.ROLE_KEY = #{roleKey}
             and gsr.DEL_FLAG=0
     </select>
+
+    <select id="countRolesByCustomerId" resultType="java.lang.Integer">
+        select count(0)
+        from gov_staff_role
+        where CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>
\ No newline at end of file