新增组员分机号分配代码提交

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java

@@ -151,6 +151,7 @@ public class OrganizeServiceImpl implements OrganizeService {
         Long currentUserId = SecurityUtils.getCurrentUserId();
         OrganizeUser organizeUserByUserId = organizeUserRepository.findByUserId(currentUserId);
         Long organizeId = organizeUserByUserId.getOrganizeId();
+        Organize organize = organizeRepository.findById(organizeId).orElseGet(Organize::new);
         //  添加组长下的组员信息
         for (OrganizeUser addOrganizeUser : organizeUser) {
             addOrganizeUser.setOrganizeId(organizeId);
@@ -158,7 +159,9 @@ public class OrganizeServiceImpl implements OrganizeService {
             addOrganizeUser.setCreateBy(currentUserId);
             OrganizeUser saveOrganizeUser = organizeUserRepository.save(addOrganizeUser);
             //添加分机号
-            extensionNumberService.assignExtensionNum(saveOrganizeUser.getOrganizeId(), saveOrganizeUser.getUserId());
+            if (organize.getCallMode() == 1){
+                extensionNumberService.assignExtensionNum(saveOrganizeUser.getOrganizeId(), saveOrganizeUser.getUserId());
+            }
         }
     }
 
@@ -425,6 +428,7 @@ public class OrganizeServiceImpl implements OrganizeService {
         Set<Long> userIds = organizeMemberDistributionDTO.getUserIds();
         Long organizeId = organizeMemberDistributionDTO.getOrganizeId();
         Long taskId = organizeMemberDistributionDTO.getTaskId();
+        Organize organize = organizeRepository.findById(organizeId).orElseGet(Organize::new);
         // 查询所有的组员
         List<OrganizeUser> userRepositoryAll = organizeUserRepository.findAll();
         List<Long> organizeUserIds = Lists.newArrayList();
@@ -439,7 +443,9 @@ public class OrganizeServiceImpl implements OrganizeService {
                 organizeUser.setCreateBy(SecurityUtils.getCurrentUserId());
                 OrganizeUser saveOrganizeUser = organizeUserRepository.save(organizeUser);
                 //添加分机号
-                extensionNumberService.assignExtensionNum(saveOrganizeUser.getOrganizeId(), saveOrganizeUser.getUserId());
+                if (organize.getCallMode() == 1){
+                    extensionNumberService.assignExtensionNum(saveOrganizeUser.getOrganizeId(), saveOrganizeUser.getUserId());
+                }
             }
         }
         //分配组员资源

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java

@@ -230,6 +230,11 @@ public class UserServiceImpl implements UserService {
         }
         // 如果用户的角色改变
         if (!resources.getRoles().equals(user.getRoles())) {
+            //查询是否已经分配到组
+            OrganizeUser organizeUser = organizeUserRepository.findByUserId(user.getId());
+            if (organizeUser != null){
+                throw new BadRequestException("用户已经分配到组,无法修改用户角色");
+            }
             redisUtils.del(CacheKey.DATA_USER + resources.getId());
             redisUtils.del(CacheKey.MENU_USER + resources.getId());
             redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());