diff --git a/ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/detail/domain/vo/ZoneApplicationSearchVo.java b/ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/detail/domain/vo/ZoneApplicationSearchVo.java index e37f60b6b..7fc044022 100644 --- a/ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/detail/domain/vo/ZoneApplicationSearchVo.java +++ b/ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/detail/domain/vo/ZoneApplicationSearchVo.java @@ -13,6 +13,12 @@ import lombok.Data; @ApiModel("专区申请搜索对象") public class ZoneApplicationSearchVo extends BaseEntity { - @ApiModelProperty(value = "搜索输入,专区名称、联系人、联系电话") - private String searchInput; + @ApiModelProperty(value = "搜索输入:专区名称") + private String name; + + @ApiModelProperty(value = "搜索输入:联系人") + private String contactPerson; + + @ApiModelProperty(value = "搜索输入:联系电话") + private String contactPhone; } diff --git a/ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/detail/mapper/ZoneApplicationMapper.java b/ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/detail/mapper/ZoneApplicationMapper.java index e77b3270c..1dbb05323 100644 --- a/ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/detail/mapper/ZoneApplicationMapper.java +++ b/ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/detail/mapper/ZoneApplicationMapper.java @@ -2,8 +2,8 @@ package com.ruoyi.zone.detail.mapper; import java.util.List; import com.ruoyi.zone.detail.domain.ZoneApplication; +import com.ruoyi.zone.detail.domain.vo.ZoneApplicationSearchVo; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; /** * 特色专区申请Mapper接口 @@ -65,8 +65,8 @@ public interface ZoneApplicationMapper /** * 根据输入匹配专区名、联系人、联系电话 * - * @param searchInput + * @param zoneApplicationSearchVo * @return 特色专区申请集合 */ - List selectZoneApplicationListBySearchInput(@Param("searchInput") String searchInput); + List selectZoneApplicationListBySearchInput(ZoneApplicationSearchVo zoneApplicationSearchVo); } diff --git a/ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/detail/service/impl/ZoneApplicationServiceImpl.java b/ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/detail/service/impl/ZoneApplicationServiceImpl.java index 9c90c4007..033d33037 100644 --- a/ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/detail/service/impl/ZoneApplicationServiceImpl.java +++ b/ruoyi-modules/ruoyi-zone/src/main/java/com/ruoyi/zone/detail/service/impl/ZoneApplicationServiceImpl.java @@ -58,7 +58,7 @@ public class ZoneApplicationServiceImpl implements IZoneApplicationService @Override public List selectZoneApplicationListBySearchInput(ZoneApplicationSearchVo zoneApplicationSearchVo) { - return zoneApplicationMapper.selectZoneApplicationListBySearchInput(zoneApplicationSearchVo.getSearchInput()); + return zoneApplicationMapper.selectZoneApplicationListBySearchInput(zoneApplicationSearchVo); } /** diff --git a/ruoyi-modules/ruoyi-zone/src/main/resources/mapper/zone/ZoneApplicationMapper.xml b/ruoyi-modules/ruoyi-zone/src/main/resources/mapper/zone/ZoneApplicationMapper.xml index db4aaba2e..6ef461b90 100644 --- a/ruoyi-modules/ruoyi-zone/src/main/resources/mapper/zone/ZoneApplicationMapper.xml +++ b/ruoyi-modules/ruoyi-zone/src/main/resources/mapper/zone/ZoneApplicationMapper.xml @@ -42,12 +42,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - diff --git a/sql/update/20230915103617_init_member_doc_menu_role.sql b/sql/update/20230915103617_init_member_doc_menu_role.sql index 9d9d304ee..1a43fc4c9 100644 --- a/sql/update/20230915103617_init_member_doc_menu_role.sql +++ b/sql/update/20230915103617_init_member_doc_menu_role.sql @@ -1,4 +1,4 @@ --- cms文章表中添加审核相关字段,并添加文章审核menu及赋予角色menu权限 +-- 初始化会员与文章相关菜单和按钮权限数据 SET FOREIGN_KEY_CHECKS = 0;