From 90afd612f0933d733d804c21a56b313ef7a548a6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 22 Aug 2022 16:19:15 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsFriendlyLinkService.java         |    3 +
 src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsAdController.java              |    6 +-
 src/main/resources/mapper/CmsAdInfoMapper.xml                                                  |   14 +++++++
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsFriendlyLinkServiceImpl.java |    6 +++
 src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsAdInfoService.java               |    3 +
 src/main/resources/mapper/CmsFriendlyLinkMapper.xml                                            |   14 +++++++
 src/main/java/com/xcong/farmer/cms/modules/system/entity/CmsFriendlyLinkEntity.java            |    4 ++
 src/main/java/com/xcong/farmer/cms/modules/system/mapper/CmsAdInfoMapper.java                  |    4 ++
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsAdInfoServiceImpl.java       |    5 ++
 src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsFriendlyLinkController.java    |    6 +-
 src/main/java/com/xcong/farmer/cms/modules/system/entity/CmsAdInfoEntity.java                  |    4 ++
 src/main/java/com/xcong/farmer/cms/modules/system/mapper/CmsFriendlyLinkMapper.java            |    4 ++
 12 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsAdController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsAdController.java
index 61e8ab3..8b32c39 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsAdController.java
+++ b/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获取信息")
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsFriendlyLinkController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsFriendlyLinkController.java
index b9e96c5..d0f3009 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsFriendlyLinkController.java
+++ b/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获取信息")
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/entity/CmsAdInfoEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/CmsAdInfoEntity.java
index 6ff4bef..1b0dd6e 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/entity/CmsAdInfoEntity.java
+++ b/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;
 }
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/entity/CmsFriendlyLinkEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/CmsFriendlyLinkEntity.java
index f291ba1..af51c85 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/entity/CmsFriendlyLinkEntity.java
+++ b/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;
 }
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/mapper/CmsAdInfoMapper.java b/src/main/java/com/xcong/farmer/cms/modules/system/mapper/CmsAdInfoMapper.java
index 67e85db..d7bba5e 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/mapper/CmsAdInfoMapper.java
+++ b/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);
 }
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/mapper/CmsFriendlyLinkMapper.java b/src/main/java/com/xcong/farmer/cms/modules/system/mapper/CmsFriendlyLinkMapper.java
index d6fb75f..65a93e9 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/mapper/CmsFriendlyLinkMapper.java
+++ b/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);
 }
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsAdInfoService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsAdInfoService.java
index 1710de7..71d7eef 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsAdInfoService.java
+++ b/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);
 }
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsFriendlyLinkService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsFriendlyLinkService.java
index fb6612c..787d768 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsFriendlyLinkService.java
+++ b/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);
 }
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsAdInfoServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsAdInfoServiceImpl.java
index 4fef3bb..0d6e918 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsAdInfoServiceImpl.java
+++ b/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);
+    }
 }
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsFriendlyLinkServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsFriendlyLinkServiceImpl.java
index 06ae868..7aae2d0 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsFriendlyLinkServiceImpl.java
+++ b/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);
+    }
 }
diff --git a/src/main/resources/mapper/CmsAdInfoMapper.xml b/src/main/resources/mapper/CmsAdInfoMapper.xml
new file mode 100644
index 0000000..4178cdd
--- /dev/null
+++ b/src/main/resources/mapper/CmsAdInfoMapper.xml
@@ -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>
\ No newline at end of file
diff --git a/src/main/resources/mapper/CmsFriendlyLinkMapper.xml b/src/main/resources/mapper/CmsFriendlyLinkMapper.xml
new file mode 100644
index 0000000..42a1ce9
--- /dev/null
+++ b/src/main/resources/mapper/CmsFriendlyLinkMapper.xml
@@ -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>
\ No newline at end of file

--
Gitblit v1.9.1