diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java index b0e10ca..d994235 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java @@ -188,4 +188,17 @@ public class CompanyController extends BaseController return toAjax(companyService.companyUp(companyId)); } + + /** + * 管理员查询公司列表 + */ + @ApiOperation("管理员查询公司列表") + @PreAuthorize("@ss.hasPermi('cms:company:adminCompanyList')") + @GetMapping("/adminCompanyList") + public TableDataInfo adminCompanyList(CompanySearch company) + { + startPage(); + List list = companyService.selectAdminCompanyList(company); + return getDataTable(list); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java index 61e74be..0f46547 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java @@ -33,4 +33,6 @@ public interface CompanyMapper extends BaseMapper Company selectCompanyByJobId(Long jobId); int updateStatus(Company company); + + List selectAdminCompanyList(Company company); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java index 48257b3..b32a01c 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java @@ -85,4 +85,6 @@ public interface ICompanyService int companyDown(Long companyId); int companyUp(Long companyId); + + List selectAdminCompanyList(Company company); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java index a7ca8f2..4dbaf88 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java @@ -387,4 +387,9 @@ public class CompanyServiceImpl extends ServiceImpl impl } return i; } + + @Override + public List selectAdminCompanyList(Company company) { + return companyMapper.selectAdminCompanyList(company); + } } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml index 2cbfb5b..5d1f809 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml @@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -173,4 +174,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update COMPANY set company_status=#{companyStatus},update_time=#{updateTime},update_by=#{updateBy} where company_id=#{companyId} and del_flag='0' + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java index 1e4df1e..a0fe470 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java @@ -136,5 +136,9 @@ public class Company extends BaseEntity @TableField(exist = false) private List jobList; - + /** + * 浪潮userid + */ + @TableField(exist = false) + private Long lcUserid; }