boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
达富斌
2025-08-26 16:11:42 +08:00
parent cd6b05f553 941dc63ce2
commit f5227ef6f7
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/companyinfo/CompanyInfoController.java
View File

@@ -73,9 +73,8 @@ public class CompanyInfoController {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得企业信息") @Operation(summary = "获得企业信息")
@Parameter(name = "id", description = "编号", required = true, example = "1024") public CommonResult<CompanyInfoRespVO> getCompanyInfo() {
public CommonResult<CompanyInfoRespVO> getCompanyInfo(@RequestParam("id") String id) { CompanyInfoDO companyInfo = companyInfoService.getCompanyInfo();
CompanyInfoDO companyInfo = companyInfoService.getCompanyInfo(id);
return success(BeanUtils.toBean(companyInfo, CompanyInfoRespVO.class)); return success(BeanUtils.toBean(companyInfo, CompanyInfoRespVO.class));
} }

3
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoService.java
View File

@@ -47,10 +47,9 @@ public interface CompanyInfoService {
/** /**
* 获得企业信息 * 获得企业信息
* *
* @param id 编号
* @return 企业信息 * @return 企业信息
*/ */
CompanyInfoDO getCompanyInfo(String id); CompanyInfoDO getCompanyInfo();
/** /**
* 获得企业信息分页 * 获得企业信息分页

8
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/companyinfo/CompanyInfoServiceImpl.java
View File

@@ -8,7 +8,7 @@ import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoP
import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoSaveReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO; import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO;
import cn.iocoder.yudao.module.farm.dal.mysql.companyinfo.CompanyInfoMapper; import cn.iocoder.yudao.module.farm.dal.mysql.companyinfo.CompanyInfoMapper;
import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@@ -82,8 +82,10 @@ public class CompanyInfoServiceImpl implements CompanyInfoService {
} }
@Override @Override
public CompanyInfoDO getCompanyInfo(String id) { public CompanyInfoDO getCompanyInfo() {
CompanyInfoDO companyInfo = companyInfoMapper.selectById(id); LambdaQueryWrapper<CompanyInfoDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CompanyInfoDO::getTenantId, getLoginUser().getTenantId());
CompanyInfoDO companyInfo = companyInfoMapper.selectOne(queryWrapper);
if (companyInfo != null) { if (companyInfo != null) {
// 触发图片集合转换，确保返回的DO对象包含转换后的图片集合 // 触发图片集合转换，确保返回的DO对象包含转换后的图片集合
companyInfo.getPublicityImageList(); companyInfo.getPublicityImageList();