新增销售公司调整角色信息

fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSON;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.SecurityUtils;
+import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.*;
 import com.fs.company.mapper.*;
 import com.fs.company.param.CompanyParam;
@@ -166,11 +167,17 @@ public class CompanyServiceImpl implements ICompanyService
             salesRole.setStatus("0");
 
             //增加销售角色菜单权限
-            String json = configService.selectConfigByKey("companymenu.config");
-            CompanyMenuConfig config = JSONUtil.toBean(json, CompanyMenuConfig.class);
-            // 注意：此处需要额外处理销售角色的权限，设置为仅"我的"相关权限
-            salesRole.setMenuIds(config.getMenuIds());
-            roleService.insertRole(salesRole);
+            try {
+                String json = configService.selectConfigByKey("companymenu.config");
+                if (StringUtils.isNotEmpty(json)) {
+                    CompanyMenuConfig config = JSONUtil.toBean(json, CompanyMenuConfig.class);
+                    salesRole.setMenuIds(config.getMenuIds());
+                    roleService.insertRole(salesRole);
+                }
+            } catch (Exception e) {
+                logger.error("获取菜单配置失败", e);
+                throw new RuntimeException("获取菜单配置失败");
+            }
             //添加用户
             CompanyUser user=new CompanyUser();
             user.setCompanyId(company.getCompanyId());