Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-admin/src/main/java/com/fs/company/controller/CompanyMenuController.java

@@ -1,6 +1,11 @@
 package com.fs.company.controller;
 
 import java.util.List;
+
+import com.fs.common.core.domain.entity.SysMenu;
+import com.fs.common.utils.ServletUtils;
+import com.fs.core.security.LoginUser;
+import com.fs.core.web.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,7 +27,7 @@ import com.fs.common.core.page.TableDataInfo;
 
 /**
  * 菜单权限Controller
- * 
+ *
  * @author fs
  * @date 2021-10-04
  */
@@ -33,6 +38,9 @@ public class CompanyMenuController extends BaseController
     @Autowired
     private ICompanyMenuService companyMenuService;
 
+    @Autowired
+    private TokenService tokenService;
+
     /**
      * 查询菜单权限列表
      */
@@ -100,4 +108,20 @@ public class CompanyMenuController extends BaseController
     {
         return toAjax(companyMenuService.deleteCompanyMenuByIds(menuIds));
     }
+
+    /**
+     * 获取菜单下拉树列表
+     */
+    /**
+     * 获取菜单下拉树列表
+     */
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(CompanyMenu menu)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Long userId = loginUser.getUser().getUserId();
+        List<CompanyMenu> menus = companyMenuService.selectMenuList(menu, userId,"00");
+        return AjaxResult.success(companyMenuService.buildMenuTreeSelect(menus));
+    }
+
 }

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

@@ -1,12 +1,14 @@
 package com.fs.company.service.impl;
 
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
 import com.fs.company.domain.*;
 import com.fs.company.mapper.*;
 import com.fs.company.param.CompanyConfigParam;
 import com.fs.company.param.CompanyParam;
+import com.fs.company.service.ICompanyRoleService;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.vo.CompanyCrmVO;
 import com.fs.company.vo.CompanyNameVO;
@@ -65,6 +67,9 @@ public class CompanyServiceImpl implements ICompanyService
     private CompanyUserPostMapper userPostMapper;
     @Autowired
     private ISysConfigService configService;
+
+    @Autowired
+    private ICompanyRoleService roleService;
     @Autowired
     private CompanyMoneyLogsMapper moneyLogsMapper;
     @Autowired
@@ -165,15 +170,18 @@ public class CompanyServiceImpl implements ICompanyService
             // 创建销售角色（新增部分，只有"我的"相关权限）
             CompanyRole salesRole = new CompanyRole();
             salesRole.setCompanyId(company.getCompanyId());
-            salesRole.setRoleName(company.getCompanyName() + "——销售");
-            salesRole.setRoleKey("sales");
+            salesRole.setRoleName(company.getCompanyName() + "_销售");
+            salesRole.setRoleKey(company.getCompanyId()+"_sales");
             salesRole.setRoleSort(1);
             salesRole.setDataScope("5");
             salesRole.setStatus("0");
-            // 注意：此处需要额外处理销售角色的权限，设置为仅"我的"相关权限
-            // 实际实现可能需要调用 permissionMapper 设置具体权限
-            roleMapper.insertCompanyRole(salesRole);
 
+            //增加销售角色菜单权限
+            String json = configService.selectConfigByKey("companymenu.config");
+            CompanyMenuConfig config = JSONUtil.toBean(json, CompanyMenuConfig.class);
+            // 注意：此处需要额外处理销售角色的权限，设置为仅"我的"相关权限
+            salesRole.setMenuIds(config.getMenuIds());
+            roleService.insertRole(salesRole);
             // 6. 创建管理员用户
             CompanyUser user = new CompanyUser();
             user.setCompanyId(company.getCompanyId());
@@ -191,21 +199,8 @@ public class CompanyServiceImpl implements ICompanyService
             user.setIsAudit(1);
             userMapper.insertCompanyUser(user);
 
-            //增加菜单权限
-            List<CompanyRoleMenu> list = new ArrayList<>();
-            String json = configService.selectConfigByKey("companymenu.config");
-            CompanyMenuConfig config = JSONUtil.toBean(json, CompanyMenuConfig.class);
-//            if (config!=null){
-//
-//            }
-            for (Long menuId : config.getMenuId())
-            {
-                CompanyRoleMenu rm = new CompanyRoleMenu();
-                rm.setRoleId(adminRole.getRoleId());
-                rm.setMenuId(menuId);
-                list.add(rm);
-            }
-            roleMenuMapper.batchRoleMenu(list);
+
+
             //添加用户角色表
             CompanyUserRole userRole=new CompanyUserRole();
             userRole.setRoleId(adminRole.getRoleId());

fs-service-system/src/main/java/com/fs/store/config/CompanyMenuConfig.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 @Data
 public class CompanyMenuConfig implements Serializable {
 
-    private Long [] menuId;
+    private Long [] menuIds;
 
 
 }

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -476,6 +476,10 @@ public class FsUserServiceImpl implements IFsUserService
             param.setUserId(0L);
             param.setCompanyId(companyUser.getCompanyId());
         }
+        //筛选问题
+        if (StringUtils.isNotBlank(param.getCompanyUserId())){
+            param.setUserId(Long.valueOf(param.getCompanyUserId()));
+        }
 
         PageHelper.startPage(param.getPageNum(), param.getPageSize());