新增配置文件

manage/ad-platform-management/src/main/java/com/baiye/config/BusinessConfig.java

@@ -0,0 +1,21 @@
+package com.baiye.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ * @author Enzo
+ * @date : 2022/10/30
+ */
+@Getter
+@Setter
+@Configuration
+@ConfigurationProperties(prefix = "business")
+public class BusinessConfig {
+
+    private List<Long> ids;
+}

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

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.json.JSONUtil;
+import com.baiye.config.BusinessConfig;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.exception.BadRequestException;
 import com.baiye.model.dto.RoleSmallDto;
@@ -45,6 +46,8 @@ import java.util.stream.Collectors;
 public class PayOrderServiceImpl implements PayOrderService {
 
     private final UserService userService;
+    private final BusinessConfig businessConfig;
+
     private final CompanyService companyService;
     private final PayOrderMapper payOrderMapper;
     private final PayOrderRepository payOrderRepository;
@@ -136,7 +139,7 @@ public class PayOrderServiceImpl implements PayOrderService {
         boolean flag = Boolean.TRUE;
         for (RoleSmallDto role : userDto.getRoles()) {
             if (role.getId() == DefaultNumberConstants.ONE_NUMBER
-                    || role.getId() == DefaultNumberConstants.EIGHT_NUMBER) {
+                    || businessConfig.getIds().contains(role.getId())) {
                 flag = Boolean.FALSE;
                 break;
             }

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

@@ -17,6 +17,7 @@ package com.baiye.modules.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
+import com.baiye.config.BusinessConfig;
 import com.baiye.config.CustomAuthorityDeserializer;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.exception.BadRequestException;
@@ -61,7 +62,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 @CacheConfig(cacheNames = "role")
 public class RoleServiceImpl implements RoleService {
-
+    private final BusinessConfig businessConfig;
     private final RoleRepository roleRepository;
     private final RoleMapper roleMapper;
     private final RoleSmallMapper roleSmallMapper;
@@ -88,7 +89,7 @@ public class RoleServiceImpl implements RoleService {
                     iterator.remove();
                 }
                 if (Boolean.TRUE.equals(byId.getIsManager())
-                        && role.getId() == DefaultNumberConstants.EIGHT_NUMBER) {
+                        && businessConfig.getIds().contains(role.getId())) {
                     iterator.remove();
                 }
                 if (Boolean.TRUE.equals(byId.getIsGroup())

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

@@ -24,6 +24,7 @@ import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baiye.config.BusinessConfig;
 import com.baiye.config.properties.FileProperties;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.exception.BadRequestException;
@@ -74,6 +75,8 @@ public class UserServiceImpl implements UserService {
     private final RedisUtils redisUtils;
     private final RoleRepository repository;
     private final FileProperties properties;
+    private final BusinessConfig businessConfig;
+
     private final CompanyService companyService;
     private final UserCacheClean userCacheClean;
     private final UserRepository userRepository;
@@ -135,7 +138,7 @@ public class UserServiceImpl implements UserService {
             Set<RoleSmallDto> roles = user.getRoles();
             if (CollUtil.isNotEmpty(roles)) {
                 for (RoleSmallDto role : roles) {
-                    if (role.getId() == DefaultNumberConstants.EIGHT_NUMBER) {
+                    if (businessConfig.getIds().contains(role.getId())) {
                         user.setIsManager(Boolean.TRUE);
                         CompanyDto companyById = companyService.findCompanyById(user.getCompanyId());
                         user.setTemplateId(companyById.getTemplateId());
@@ -178,7 +181,7 @@ public class UserServiceImpl implements UserService {
         Set<Role> roles = userDTO.getRoles();
         if (CollUtil.isNotEmpty(roles)) {
             for (Role role : roles) {
-                if (role.getId() == DefaultNumberConstants.EIGHT_NUMBER) {
+                if (businessConfig.getIds().contains(role.getId())) {
                     flag = Boolean.TRUE;
                     break;
                 }
@@ -333,7 +336,7 @@ public class UserServiceImpl implements UserService {
         Set<Role> roles = user.getRoles();
         for (Role role : roles) {
             // TODO 修改管理员id
-            if (role.getId() == DefaultNumberConstants.EIGHT_NUMBER) {
+            if (businessConfig.getIds().contains(role.getId())) {
                 userDto.setIsManager(Boolean.TRUE);
             }
             if (role.getId() == DefaultNumberConstants.NINE_NUMBER) {
@@ -511,7 +514,7 @@ public class UserServiceImpl implements UserService {
             convert.setAddWeChatFlag(addWeChatFlag);
             convert.setOnlineStatus(weChatUserService.isOnlineByWechat(convert.getId()));
             for (Role role : roles) {
-                if (role.getId() == DefaultNumberConstants.EIGHT_NUMBER) {
+                if (businessConfig.getIds().contains(role.getId())) {
                     convert.setIsManager(Boolean.TRUE);
                     if (companyByUserId != null) {
 

manage/ad-platform-management/src/main/resources/config/application-dev.yml

@@ -81,7 +81,10 @@ login:
     font-name:
     # 字体大小
     font-size: 25
-
+business:
+  ids:
+  - 8
+  - 10
 
 
 #是否允许生成代码，生产环境设置为false

manage/ad-platform-management/src/main/resources/config/application-prod.yml

@@ -80,7 +80,10 @@ login:
     # 字体大小
     font-size: 25
 
-
+business:
+  ids:
+    - 8
+    - 10
 
 #是否允许生成代码，生产环境设置为false
 generator: