From 4c7331427a2eedb55c3c53c89a96b35e8ce473b7 Mon Sep 17 00:00:00 2001 From: sh Date: Fri, 24 Oct 2025 15:34:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9F=A5=E8=AF=A2app=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=80=E5=8E=86=E6=97=B6=EF=BC=8C=E4=BC=81=E4=B8=9A=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=BC=81=E4=B8=9A=E8=81=94=E7=B3=BB=E4=BA=BA=E7=AD=89?= =?UTF-8?q?=EF=BC=8C=E6=B1=82=E8=81=8C=E8=80=85=E8=BF=94=E5=9B=9E=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=BB=8F=E5=8E=86=E7=AD=89=202.=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=94=A8=E6=88=B7=E6=97=B6=EF=BC=8C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/service/impl/AppUserServiceImpl.java | 16 ++++++++++++---- .../cms/service/impl/CompanyServiceImpl.java | 5 +++++ .../ruoyi/common/core/domain/entity/AppUser.java | 4 ++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java index dfe03ac..00b0b32 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java @@ -10,9 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.cms.mapper.*; import com.ruoyi.cms.util.StringUtil; -import com.ruoyi.common.core.domain.entity.Company; -import com.ruoyi.common.core.domain.entity.JobTitle; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.entity.*; import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SiteSecurityUtils; @@ -20,7 +18,6 @@ import com.ruoyi.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.cms.service.IAppUserService; /** @@ -64,6 +61,17 @@ public class AppUserServiceImpl extends ServiceImpl imple if("0".equals(appUser.getIsCompanyUser())){ Company company=companyMapper.selectOne(Wrappers.lambdaQuery().eq(Company::getCode, appUser.getIdCard()).orderByDesc(Company::getUpdateTime).last("LIMIT 1")); appUser.setCompany(company); + if(company!=null){ + CompanyContact contact=new CompanyContact(); + contact.setCompanyId(company.getCompanyId()); + List companyContactList=companyContactMapper.getSelectList(contact); + company.setCompanyContactList(companyContactList); + } + }else if("1".equals(appUser.getIsCompanyUser())){ + UserWorkExperiences workExperiences=new UserWorkExperiences(); + workExperiences.setUserId(appUser.getUserId()); + List experiences =userWorkExperiencesMapper.getWorkExperiencesList(workExperiences); + appUser.setExperiencesList(experiences); } return appUser; } 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 9d7ed0c..d7fb9b1 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 @@ -299,6 +299,11 @@ public class CompanyServiceImpl extends ServiceImpl impl @Override public Company queryCodeCompany(String code) { Company companyResult = companyMapper.selectOne(Wrappers.lambdaQuery().eq(Company::getCode, code).orderByDesc(Company::getUpdateTime).last("LIMIT 1")); + if(companyResult!=null){ + CompanyContact contact=new CompanyContact(); + contact.setCompanyId(companyResult.getCompanyId()); + List contacts=companyContactMapper.getSelectList(contact); + } return companyResult; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java index 229a124..f5528e5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java @@ -134,4 +134,8 @@ public class AppUser extends BaseEntity @TableField(exist = false) @ApiModelProperty("公司信息") private Company company; + + @TableField(exist = false) + @ApiModelProperty("工作经历列表") + private List experiencesList; }