fix

Helius

2022-08-22 90afd612f0933d733d804c21a56b313ef7a548a6

fix

 src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsAdController.java

@@ -41,10 +41,10 @@
    public Result list(@RequestBody @Valid AdListDto adListDto) {
        Page<CmsAdInfoEntity> page = new Page<>(adListDto.getPageNum(), adListDto.getPageSize());
        UserEntity user = LoginUserUtil.getLoginUser();
        QueryWrapper<CmsAdInfoEntity> query = new QueryWrapper<>();
        query.eq("company_id", user.getCompanyId());
        CmsAdInfoEntity cmsAdInfoEntity = new CmsAdInfoEntity();
        cmsAdInfoEntity.setCompanyId(user.getCompanyId());

        return Result.ok("获取成功", cmsAdInfoService.page(page, query));
        return Result.ok("获取成功", cmsAdInfoService.findInPage(page, cmsAdInfoEntity));
    }

    @ApiOperation(value = "根据ID获取信息")

 src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsFriendlyLinkController.java

@@ -40,11 +40,11 @@
    @PostMapping(value = "/list")
    public Result list(@RequestBody @Valid FriendlyInfoListDto friendlyInfoListDto) {
        UserEntity user = LoginUserUtil.getLoginUser();
        QueryWrapper<CmsAdInfoEntity> query = new QueryWrapper<>();
        query.eq("company_id", user.getCompanyId());

        CmsFriendlyLinkEntity friendlyLink = new CmsFriendlyLinkEntity();
        friendlyLink.setCompanyId(user.getCompanyId());
        Page<CmsFriendlyLinkEntity> page = new Page<>(friendlyInfoListDto.getPageNum(), friendlyInfoListDto.getPageSize());
        return Result.ok("获取成功", cmsFriendlyLinkService.page(page));
        return Result.ok("获取成功", cmsFriendlyLinkService.findInPage(page, friendlyLink));
    }

    @ApiOperation(value = "根据ID获取信息")

 src/main/java/com/xcong/farmer/cms/modules/system/entity/CmsAdInfoEntity.java

@@ -1,5 +1,6 @@
package com.xcong.farmer.cms.modules.system.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.farmer.cms.common.system.base.BaseEntity;
import lombok.Data;
@@ -23,4 +24,7 @@
    private String remark;

    private Long companyId;

    @TableField(exist = false)
    private String groupName;
}

 src/main/java/com/xcong/farmer/cms/modules/system/entity/CmsFriendlyLinkEntity.java

@@ -1,5 +1,6 @@
package com.xcong.farmer.cms.modules.system.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.farmer.cms.common.system.base.BaseEntity;
import lombok.Data;
@@ -25,4 +26,7 @@
    private String remark;

    private Long companyId;

    @TableField(exist = false)
    private String groupName;
}

 src/main/java/com/xcong/farmer/cms/modules/system/mapper/CmsAdInfoMapper.java

@@ -1,7 +1,11 @@
package com.xcong.farmer.cms.modules.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xcong.farmer.cms.modules.system.entity.CmsAdInfoEntity;
import org.apache.ibatis.annotations.Param;

public interface CmsAdInfoMapper extends BaseMapper<CmsAdInfoEntity> {

    Page<CmsAdInfoEntity> selectInPage(Page<CmsAdInfoEntity> page, @Param("record") CmsAdInfoEntity cmsAdInfoEntity);
}

 src/main/java/com/xcong/farmer/cms/modules/system/mapper/CmsFriendlyLinkMapper.java

@@ -1,7 +1,11 @@
package com.xcong.farmer.cms.modules.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xcong.farmer.cms.modules.system.entity.CmsFriendlyLinkEntity;
import org.apache.ibatis.annotations.Param;

public interface CmsFriendlyLinkMapper extends BaseMapper<CmsFriendlyLinkEntity> {

    Page<CmsFriendlyLinkEntity> selectInPage(Page<CmsFriendlyLinkEntity> page, @Param("record") CmsFriendlyLinkEntity cmsFriendlyLinkEntity);
}

 src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsAdInfoService.java

@@ -1,8 +1,11 @@
package com.xcong.farmer.cms.modules.system.service;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.farmer.cms.modules.system.entity.CmsAdInfoEntity;
import org.springframework.stereotype.Service;

public interface ICmsAdInfoService extends IService<CmsAdInfoEntity> {

    Page<CmsAdInfoEntity> findInPage(Page<CmsAdInfoEntity> page, CmsAdInfoEntity cmsAdInfoEntity);
}

 src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsFriendlyLinkService.java

@@ -1,8 +1,11 @@
package com.xcong.farmer.cms.modules.system.service;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.farmer.cms.modules.system.entity.CmsFriendlyLinkEntity;
import com.xcong.farmer.cms.modules.system.mapper.CmsFriendlyLinkMapper;

public interface ICmsFriendlyLinkService extends IService<CmsFriendlyLinkEntity> {

    Page<CmsFriendlyLinkEntity> findInPage(Page<CmsFriendlyLinkEntity> page, CmsFriendlyLinkEntity cmsFriendlyLinkEntity);
}

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsAdInfoServiceImpl.java

@@ -1,5 +1,6 @@
package com.xcong.farmer.cms.modules.system.service.Impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.modules.system.entity.CmsAdInfoEntity;
import com.xcong.farmer.cms.modules.system.mapper.CmsAdInfoMapper;
@@ -14,4 +15,8 @@
@Slf4j
@Service
public class CmsAdInfoServiceImpl extends ServiceImpl<CmsAdInfoMapper, CmsAdInfoEntity> implements ICmsAdInfoService {
    @Override
    public Page<CmsAdInfoEntity> findInPage(Page<CmsAdInfoEntity> page, CmsAdInfoEntity cmsAdInfoEntity) {
        return this.baseMapper.selectInPage(page, cmsAdInfoEntity);
    }
}

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsFriendlyLinkServiceImpl.java

@@ -1,5 +1,6 @@
package com.xcong.farmer.cms.modules.system.service.Impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.modules.system.entity.CmsFriendlyLinkEntity;
import com.xcong.farmer.cms.modules.system.mapper.CmsFriendlyLinkMapper;
@@ -14,4 +15,9 @@
@Slf4j
@Service
public class CmsFriendlyLinkServiceImpl extends ServiceImpl<CmsFriendlyLinkMapper, CmsFriendlyLinkEntity> implements ICmsFriendlyLinkService {

    @Override
    public Page<CmsFriendlyLinkEntity> findInPage(Page<CmsFriendlyLinkEntity> page, CmsFriendlyLinkEntity cmsFriendlyLinkEntity) {
        return this.baseMapper.selectInPage(page, cmsFriendlyLinkEntity);
    }
}

 src/main/resources/mapper/CmsAdInfoMapper.xml

New file
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xcong.farmer.cms.modules.system.mapper.CmsAdInfoMapper">

    <select id="selectInPage" resultType="com.xcong.farmer.cms.modules.system.entity.CmsAdInfoEntity">
        select
               a.*,
               b.name groupName
        from cms_ad_info a
        left join cms_group_info b on a.group_id=b.id
        where a.company_id=#{record.companyId}
    </select>

</mapper>

 src/main/resources/mapper/CmsFriendlyLinkMapper.xml

New file
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xcong.farmer.cms.modules.system.mapper.CmsFriendlyLinkMapper">

    <select id="selectInPage" resultType="com.xcong.farmer.cms.modules.system.entity.CmsFriendlyLinkEntity">
        select
         a.*,
         b.name groupName
        from cms_friendly_link a
            left join cms_group_info b on a.group_id=b.id
        where a.company_id=#{record.companyId}
    </select>

</mapper>