fix
Helius
2022-08-24 442600e2cb63f711418b8eb0f4ab8e2b97eb19c9
fix
5 files deleted
6 files modified
31 ■■■■■ changed files
lib/abi-0.3.0.jar patch | view | raw | blame | history
lib/core-0.3.0.jar patch | view | raw | blame | history
lib/taobao-sdk-java.jar patch | view | raw | blame | history
lib/utils-0.3.0.jar patch | view | raw | blame | history
src/main/java/com/xcong/farmer/cms/modules/core/Test.java 8 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsAdController.java 2 ●●● patch | view | raw | blame | history
src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsFriendlyLinkController.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdListDto.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/farmer/cms/modules/system/dto/FriendlyInfoListDto.java 4 ●●●● patch | view | raw | blame | history
src/main/resources/mapper/CmsAdInfoMapper.xml 3 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/CmsFriendlyLinkMapper.xml 7 ●●●● patch | view | raw | blame | history
lib/abi-0.3.0.jar
Binary files differ
lib/core-0.3.0.jar
Binary files differ
lib/taobao-sdk-java.jar
Binary files differ
lib/utils-0.3.0.jar
Binary files differ
src/main/java/com/xcong/farmer/cms/modules/core/Test.java
File was deleted
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));
    }
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));
    }
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;
}
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;
}
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>
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>