From 92f4570d877d05a561f5f54c65e45a2155464ad0 Mon Sep 17 00:00:00 2001
From: OTTO <731554297@qq.com>
Date: Wed, 19 Jun 2024 14:31:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E5=BE=AE=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?):=20=E4=B8=93=E5=8C=BA=E4=BC=9A=E5=91=98=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=BA=94=E5=BD=93=E5=9C=A8=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E7=89=B9=E8=89=B2=E4=B8=93=E5=8C=BA?=
 =?UTF-8?q?=E6=97=B6=E6=89=8D=E6=89=A7=E8=A1=8C=EF=BC=8C=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=80=A6=E5=90=88=E6=97=A0=E6=B3=95=E6=8B=94?=
 =?UTF-8?q?=E6=8F=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SysUserDeptRoleServiceImpl.java      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java
index 6cd37fc0e..6655052e7 100644
--- a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java
+++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/service/impl/SysUserDeptRoleServiceImpl.java
@@ -103,17 +103,21 @@ public class SysUserDeptRoleServiceImpl implements ISysUserDeptRoleService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int deleteSysUserDeptRoleByDeptIdAndUserIds(Long deptId, Long[] userIds) {
-        List<Long> memberUserIdList = FeignUtils.getReturnData(
-                remoteZoneService.checkUsersIsMemberInDept(deptId, userIds, SecurityConstants.INNER)
-        );
-        // 检查该身份是否为会员用户，若是则将身份调整为会员并且不删除该身份
-        if (memberUserIdList != null && !memberUserIdList.isEmpty()) {
-            userIds = Arrays.stream(userIds).filter(x -> !memberUserIdList.contains(x)).toArray(Long[]::new);
-            SysRole memberRole = sysRoleService.selectRoleByKey(SystemRole.ZONE_MEMBER.getRoleKey());
-            for (Long userId : memberUserIdList) {
-                updateSysUserDeptRole(userId, deptId, memberRole.getRoleId());
+        SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
+        if (CacheConstants.DEPT_TYPE_TSZQ == sysDept.getDeptType()) {
+            List<Long> memberUserIdList = FeignUtils.getReturnData(
+                    remoteZoneService.checkUsersIsMemberInDept(deptId, userIds, SecurityConstants.INNER)
+            );
+            // 检查该身份是否为会员用户，若是则将身份调整为会员并且不删除该身份
+            if (memberUserIdList != null && !memberUserIdList.isEmpty()) {
+                userIds = Arrays.stream(userIds).filter(x -> !memberUserIdList.contains(x)).toArray(Long[]::new);
+                SysRole memberRole = sysRoleService.selectRoleByKey(SystemRole.ZONE_MEMBER.getRoleKey());
+                for (Long userId : memberUserIdList) {
+                    updateSysUserDeptRole(userId, deptId, memberRole.getRoleId());
+                }
             }
         }
+
         if (userIds == null || userIds.length == 0) {
             return 1;
         }