模块与权限添加

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -3295,18 +3295,18 @@ public class WeiXinCorpController {
         Company company = companyMapper.selectById(companyId);
         SysRole sysRole = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("company_id", companyId).eq("rolename", "超级管理员"));
         QueryWrapper<SysModule> sysModuleQueryWrapper = new QueryWrapper<>();
-        //项目协作平台
-        if (company.getPackageProject().equals(1)){
-            sysModuleQueryWrapper.or().eq("package_project", 1);
-        }
+//        //项目协作平台
+//        if (company.getPackageProject().equals(1)){
+//            sysModuleQueryWrapper.or().eq("package_project", 1);
+//        }
         //OA平台;请假，出差等
         if (company.getPackageOa().equals(1)){
             sysModuleQueryWrapper.or().eq("package_oa", 1);
         }
-        //费用报销
-        if (company.getPackageExpense().equals(1)){
-            sysModuleQueryWrapper.or().eq("package_expense", 1);
-        }
+//        //费用报销
+//        if (company.getPackageExpense().equals(1)){
+//            sysModuleQueryWrapper.or().eq("package_expense", 1);
+//        }
         //客户管理
         if (company.getPackageCustomer().equals(1)){
             sysModuleQueryWrapper.or().eq("package_customer", 1);
@@ -3315,10 +3315,10 @@ public class WeiXinCorpController {
         if (company.getPackageEngineering().equals(1)){
             sysModuleQueryWrapper.or().eq("package_engineering", 1);
         }
-        //供应商模块
-        if (company.getPackageProvider().equals(1)){
-            sysModuleQueryWrapper.or().eq("package_provider", 1);
-        }
+//        //供应商模块
+//        if (company.getPackageProvider().equals(1)){
+//            sysModuleQueryWrapper.or().eq("package_provider", 1);
+//        }
         List<SysModule> sysModules = sysModuleMapper.selectList(sysModuleQueryWrapper);
         //过滤掉已开通的模块
         List<SysRoleModule> modular = sysRoleModuleMapper.selectList(new QueryWrapper<SysRoleModule>().eq("role_id", sysRole.getId()));
@@ -3345,6 +3345,7 @@ public class WeiXinCorpController {
         System.err.println(company.getCompanyName() + "已开通模块；" + sysRoleModules.toString());
         List<Integer> sysModulesId = collect.stream().map((s) -> s.getId()).collect(Collectors.toList());
         List<SysFunction> sysFunctions = sysFunctionMapper.selectList(new QueryWrapper<SysFunction>().in("module_id", sysModulesId));
+        //进行权限添加
         ArrayList<SysRoleFunction> sysRoleFunctions = new ArrayList<>();
         for (SysFunction sysFunction : sysFunctions) {
             SysRoleFunction sysRoleFunction = new SysRoleFunction();