From 442600e2cb63f711418b8eb0f4ab8e2b97eb19c9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 24 Aug 2022 18:38:19 +0800
Subject: [PATCH] fix
---
/dev/null | 8 --------
src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsAdController.java | 2 +-
src/main/resources/mapper/CmsAdInfoMapper.xml | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdListDto.java | 5 +++++
src/main/resources/mapper/CmsFriendlyLinkMapper.xml | 7 ++++++-
src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsFriendlyLinkController.java | 2 ++
src/main/java/com/xcong/farmer/cms/modules/system/dto/FriendlyInfoListDto.java | 4 ++++
7 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/lib/abi-0.3.0.jar b/lib/abi-0.3.0.jar
deleted file mode 100644
index cc34ed3..0000000
--- a/lib/abi-0.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/lib/core-0.3.0.jar b/lib/core-0.3.0.jar
deleted file mode 100644
index 50f0684..0000000
--- a/lib/core-0.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/lib/taobao-sdk-java.jar b/lib/taobao-sdk-java.jar
deleted file mode 100644
index c0fe315..0000000
--- a/lib/taobao-sdk-java.jar
+++ /dev/null
Binary files differ
diff --git a/lib/utils-0.3.0.jar b/lib/utils-0.3.0.jar
deleted file mode 100644
index fb2216d..0000000
--- a/lib/utils-0.3.0.jar
+++ /dev/null
Binary files differ
diff --git a/src/main/java/com/xcong/farmer/cms/modules/core/Test.java b/src/main/java/com/xcong/farmer/cms/modules/core/Test.java
deleted file mode 100644
index ef70753..0000000
--- a/src/main/java/com/xcong/farmer/cms/modules/core/Test.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.xcong.farmer.cms.modules.core;
-
-/**
- * @author wzy
- * @date 2022-07-03
- **/
-public class Test {
-}
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 8b32c39..d54aa9c 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
@@ -43,7 +43,7 @@
UserEntity user = LoginUserUtil.getLoginUser();
CmsAdInfoEntity cmsAdInfoEntity = new CmsAdInfoEntity();
cmsAdInfoEntity.setCompanyId(user.getCompanyId());
-
+ cmsAdInfoEntity.setName(adListDto.getName());
return Result.ok("获取成功", cmsAdInfoService.findInPage(page, cmsAdInfoEntity));
}
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 d0f3009..3295a8f 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
@@ -43,6 +43,8 @@
CmsFriendlyLinkEntity friendlyLink = new CmsFriendlyLinkEntity();
friendlyLink.setCompanyId(user.getCompanyId());
+ friendlyLink.setName(friendlyInfoListDto.getName());
+
Page<CmsFriendlyLinkEntity> page = new Page<>(friendlyInfoListDto.getPageNum(), friendlyInfoListDto.getPageSize());
return Result.ok("获取成功", cmsFriendlyLinkService.findInPage(page, friendlyLink));
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdListDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdListDto.java
index f184196..561f9d8 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdListDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdListDto.java
@@ -1,6 +1,7 @@
package com.xcong.farmer.cms.modules.system.dto;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -10,4 +11,8 @@
@Data
@ApiModel(value = "AdListDto", description = "广告列表")
public class AdListDto extends CommonPageDto {
+
+ @ApiModelProperty(value = "广告名称")
+ private String name;
+
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/FriendlyInfoListDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/FriendlyInfoListDto.java
index 954e496..24c7008 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/FriendlyInfoListDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/FriendlyInfoListDto.java
@@ -1,6 +1,7 @@
package com.xcong.farmer.cms.modules.system.dto;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -10,4 +11,7 @@
@Data
@ApiModel(value = "FriendlyInfoListDto", description = "友情链接参数接收类")
public class FriendlyInfoListDto extends CommonPageDto {
+
+ @ApiModelProperty(value = "友情链接名称")
+ private String name;
}
diff --git a/src/main/resources/mapper/CmsAdInfoMapper.xml b/src/main/resources/mapper/CmsAdInfoMapper.xml
index 4178cdd..2ff7e8c 100644
--- a/src/main/resources/mapper/CmsAdInfoMapper.xml
+++ b/src/main/resources/mapper/CmsAdInfoMapper.xml
@@ -9,6 +9,9 @@
from cms_ad_info a
left join cms_group_info b on a.group_id=b.id
where a.company_id=#{record.companyId}
+ <if test="record.name != null and record.name != ''">
+ and a.name like concat(concat('%', #{record.name}), '%')
+ </if>
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/CmsFriendlyLinkMapper.xml b/src/main/resources/mapper/CmsFriendlyLinkMapper.xml
index 42a1ce9..e129cca 100644
--- a/src/main/resources/mapper/CmsFriendlyLinkMapper.xml
+++ b/src/main/resources/mapper/CmsFriendlyLinkMapper.xml
@@ -8,7 +8,12 @@
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}
+ <where>
+ a.company_id=#{record.companyId}
+ <if test="record.name != null and record.name != ''">
+ and a.name like concat(concat('%', #{record.name}), '%')
+ </if>
+ </where>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1