From c19ce04ea2a7a84a072535450a6d2892eff96dcd Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 26 Jul 2024 17:34:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=EF=BC=9A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B0=E7=94=A8=E6=88=B7=EF=BC=88=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=EF=BC=89=E5=92=8C=E4=BC=81=E4=B8=9A=E7=9A=84=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E7=9A=84=E6=80=BB=E5=85=AC=E5=8F=B8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/basicdata/controller/CompanyController.java | 2 +- .../modules/basicdata/service/impl/CompanyServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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())); } }