diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java index eac01385a..987faffce 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java @@ -305,7 +305,7 @@ public class CompanyController { return Result.success(companyService.getTenantOrgTreeList(paramMap)); } - @ApiOperation(value = "查询新用户(租户)的所属的总公司列表", notes = "查询新用户(租户)的所属的总公司列表", httpMethod = "POST") + @ApiOperation(value = "查询新用户(租户)和企业的所属的总公司列表", notes = "查询新用户(租户)和企业的所属的总公司列表", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", required = true, dataType = "String"), }) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java index 053c10cf4..705a84186 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java @@ -875,7 +875,11 @@ public class CompanyServiceImpl extends ServiceImpl impl } else if (Objects.equals(systemUser.getAccountType(), 5) || Objects.equals(systemUser.getAccountType(), 6)) { return companyMapper.getMyHeadquarterCompanyListForProject(paramMap); } else { - throw new OpenAlertException("只有新用户和供应商和项目账号和项目子账号有效"); + //企业 + Company company = companyMapper.selectOne(new LambdaQueryWrapper() + .eq(Company::getCompanySn, systemUser.getSn())); + return companyMapper.selectList(new LambdaQueryWrapper() + .eq(Company::getCompanySn, company.getHeadquartersSn())); } }