|
@@ -3283,6 +3283,8 @@ public class WeiXinCorpController {
|
|
}
|
|
}
|
|
companyMapper.updateById(newCompany);
|
|
companyMapper.updateById(newCompany);
|
|
System.out.println("已成功变更版本,版本号为:"+edition_id);
|
|
System.out.println("已成功变更版本,版本号为:"+edition_id);
|
|
|
|
+ //开通模块和权限
|
|
|
|
+ rootRole(wxCorpInfo.getCompanyId());
|
|
}else {
|
|
}else {
|
|
System.out.println("++++++++++++++++++++++"+"版本变更失败!"+"++++++++++++++++++++++++");
|
|
System.out.println("++++++++++++++++++++++"+"版本变更失败!"+"++++++++++++++++++++++++");
|
|
}
|
|
}
|
|
@@ -3510,10 +3512,12 @@ public class WeiXinCorpController {
|
|
//为超级管理员角色赋予模块权限
|
|
//为超级管理员角色赋予模块权限
|
|
private void rootRole (Integer companyId){
|
|
private void rootRole (Integer companyId){
|
|
Company company = companyMapper.selectById(companyId);
|
|
Company company = companyMapper.selectById(companyId);
|
|
- if (company.getPackageOa().equals(1) || company.getPackageCustomer().equals(1) || company.getPackageEngineering().equals(1)){
|
|
|
|
|
|
+ System.out.println("#############################公司信息为:" + company.toString());
|
|
|
|
+ if (company.getPackageOa().equals(1) || company.getPackageCustomer().equals(1) || company.getPackageEngineering().equals(1) || company.getPackageProvider().equals(1)){
|
|
System.err.println("##############################为超级管理员开通模块及权限");
|
|
System.err.println("##############################为超级管理员开通模块及权限");
|
|
SysRole sysRole = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("company_id", companyId).eq("rolename", "超级管理员"));
|
|
SysRole sysRole = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("company_id", companyId).eq("rolename", "超级管理员"));
|
|
QueryWrapper<SysModule> sysModuleQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<SysModule> sysModuleQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ //请假出差
|
|
if (company.getPackageOa().equals(1)){
|
|
if (company.getPackageOa().equals(1)){
|
|
sysModuleQueryWrapper.or().eq("package_oa", 1);
|
|
sysModuleQueryWrapper.or().eq("package_oa", 1);
|
|
}
|
|
}
|
|
@@ -3525,6 +3529,10 @@ public class WeiXinCorpController {
|
|
if (company.getPackageEngineering().equals(1)){
|
|
if (company.getPackageEngineering().equals(1)){
|
|
sysModuleQueryWrapper.or().eq("package_engineering", 1);
|
|
sysModuleQueryWrapper.or().eq("package_engineering", 1);
|
|
}
|
|
}
|
|
|
|
+ //供应商模块
|
|
|
|
+ if (company.getPackageProvider().equals(1)){
|
|
|
|
+ sysModuleQueryWrapper.or().eq("Package_provider", 1);
|
|
|
|
+ }
|
|
List<SysModule> sysModules = sysModuleMapper.selectList(sysModuleQueryWrapper);
|
|
List<SysModule> sysModules = sysModuleMapper.selectList(sysModuleQueryWrapper);
|
|
//过滤掉已开通的模块
|
|
//过滤掉已开通的模块
|
|
List<SysRoleModule> modular = sysRoleModuleMapper.selectList(new QueryWrapper<SysRoleModule>().eq("role_id", sysRole.getId()));
|
|
List<SysRoleModule> modular = sysRoleModuleMapper.selectList(new QueryWrapper<SysRoleModule>().eq("role_id", sysRole.getId()));
|