diff --git a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/RoleNumberConstants.java b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/RoleNumberConstants.java index 2667dcf3..09d33d0d 100644 --- a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/RoleNumberConstants.java +++ b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/RoleNumberConstants.java @@ -36,4 +36,7 @@ public class RoleNumberConstants { * 拓客业余主管 */ public static final Long MINUS_TEN_NUMBER = 10L; + + + } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/OrganizeServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/OrganizeServiceImpl.java index 55e162ff..e8625915 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/OrganizeServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/OrganizeServiceImpl.java @@ -544,10 +544,10 @@ public class OrganizeServiceImpl implements OrganizeService { List roles = Lists.newArrayList(); Long roleId = Collections.min(roleService.findByUsersId(SecurityUtils.getCurrentUserId()).stream().map(RoleSmallDto::getId).collect(Collectors.toList())); // 判断角色，管理员只查组长角色的用户 - if (roleId.equals(RoleNumberConstants.MINUS_EIGHT_NUMBER) || roleId.equals(RoleNumberConstants.MINUS_TEN_NUMBER)) { - roles.add(RoleNumberConstants.MINUS_NINE_NUMBER); - } else { + if (roleId.equals(RoleNumberConstants.MINUS_NINE_NUMBER)) { roles.add(RoleNumberConstants.MINUS_FIVE_NUMBER); + } else { + roles.add(RoleNumberConstants.MINUS_NINE_NUMBER); } //查询本公司-角色下所有用户 List userDtoList = userService.findByManager(roles); diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java index fb1ad31e..5d1dc152 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java @@ -62,6 +62,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheConfig; @@ -252,6 +253,7 @@ public class UserServiceImpl implements UserService { Set roles = userDTO.getRoles(); if (CollUtil.isNotEmpty(roles)) { for (Role role : roles) { + // 为管理员 if (businessConfig.getIds().contains(role.getId())) { flag = Boolean.TRUE; break; @@ -535,6 +537,7 @@ public class UserServiceImpl implements UserService { if (Boolean.FALSE.equals(resources.getEnabled())) { this.remoteAuthService.delete(Collections.singleton(resources.getId())); for (Role role : resources.getRoles()) { + // 禁用管理员账号 同时禁用下面所有账号 if (businessConfig.getIds().contains(role.getId())) { List byWhichUserId = userRepository.findByWhichUserId(user.getId()); if (CollUtil.isNotEmpty(byWhichUserId)) { @@ -660,8 +663,9 @@ public class UserServiceImpl implements UserService { if (replaceUserId != null) replaceRoleIds = findById(replaceUserId).getRoles().stream().map(RoleSmallDto::getId).collect(Collectors.toSet()); // 一: 删除业务管理员账号(删除公司) - if (roleIds.contains(RoleNumberConstants.MINUS_EIGHT_NUMBER) - || roleIds.contains(RoleNumberConstants.MINUS_TEN_NUMBER)) { + // 求交集 + Collection intersection = CollectionUtils.intersection(businessConfig.getIds(), roleIds); + if (!intersection.isEmpty()) { UserQueryCriteria userQueryCriteria = new UserQueryCriteria(); userQueryCriteria.setCompanyId(user.getCompanyId()); List userDtos = queryAll(userQueryCriteria); @@ -801,7 +805,10 @@ public class UserServiceImpl implements UserService { if (role.getId() == DefaultNumberConstants.FIVE_NUMBER) { convert.setIsOperator(Boolean.TRUE); } - if (role.getId() == DefaultNumberConstants.TEN_NUMBER) { + // TODO + if (role.getId() == DefaultNumberConstants.TEN_NUMBER + || role.getId() == DefaultNumberConstants.FIFTEEN_NUMBER + || role.getId() == DefaultNumberConstants.SIXTEEN_NUMBER) { convert.setIsTokerAdmin(Boolean.TRUE); } } diff --git a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml index 8746d17e..94fb4dfd 100644 --- a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml +++ b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml @@ -7,12 +7,12 @@ spring: server-addr: localhost:8848 redis: database: 2 - host: 8.130.96.163 + host: 39.100.77.21 timeout: 5000 - password: + password: sC33HXphkHBRj4Jb elasticsearch: rest: - uris: 8.130.96.163:9200 + uris: 39.100.77.21:9200 read-timeout: 30s connection-timeout: 5s username: elastic @@ -21,7 +21,7 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://8.130.96.163:3306/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://39.100.77.21:3306/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull username: root password: y7z7noq2 # 初始连接数 @@ -93,7 +93,8 @@ business: ids: - 8 - 10 - + - 15 + - 16 #是否允许生成代码，生产环境设置为false generator: diff --git a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml index 2ae581af..e4aea615 100644 --- a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml +++ b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml @@ -89,6 +89,8 @@ business: ids: - 8 - 10 + - 15 + - 16 #是否允许生成代码，生产环境设置为false generator: