分离不同状态的数据 #11

Merged
xiaohai2271 merged 13 commits from dev into master 2020-08-31 13:01:09 +08:00
6 changed files with 11 additions and 6 deletions
Showing only changes of commit 9b460ff33c - Show all commits

View File

@@ -59,8 +59,9 @@ public class LinksController {
@GetMapping("/admin/links") @GetMapping("/admin/links")
public Response all(@RequestParam("page") int page, public Response all(@RequestParam("page") int page,
@RequestParam("count") int count) { @RequestParam("count") int count,
return Response.success(partnerSiteService.partnerSitePages(page, count)); @RequestParam(value = "deleted", required = false) Boolean deleted) {
return Response.success(partnerSiteService.partnerSitePages(page, count, deleted));
} }
@PostMapping("/apply") @PostMapping("/apply")

View File

@@ -36,5 +36,6 @@ public interface PartnerMapper {
List<PartnerSite> findAll(); List<PartnerSite> findAll();
List<PartnerSite> findAll(Boolean deleted);
} }

View File

@@ -45,7 +45,7 @@ public interface PartnerSiteService {
* @param page 数据页 * @param page 数据页
* @return 分页数据 * @return 分页数据
*/ */
PageData<PartnerSite> partnerSitePages(int page, int count); PageData<PartnerSite> partnerSitePages(int page, int count, Boolean deleted);
/** /**
* 获取全部数据 * 获取全部数据

View File

@@ -123,9 +123,9 @@ public class PartnerSiteServiceImpl implements PartnerSiteService {
} }
@Override @Override
public PageData<PartnerSite> partnerSitePages(int page, int count) { public PageData<PartnerSite> partnerSitePages(int page, int count, Boolean deleted) {
PageHelper.startPage(page, count); PageHelper.startPage(page, count);
List<PartnerSite> sitePage = partnerMapper.findAll(); List<PartnerSite> sitePage = partnerMapper.findAll(deleted);
PageInfo<PartnerSite> pageInfo = new PageInfo<PartnerSite>(sitePage); PageInfo<PartnerSite> pageInfo = new PageInfo<PartnerSite>(sitePage);
return new PageData<>(pageInfo, sitePage); return new PageData<>(pageInfo, sitePage);
} }

View File

@@ -78,6 +78,9 @@
<select id="findAll" resultMap="partnerSiteResultMap"> <select id="findAll" resultMap="partnerSiteResultMap">
select * select *
from links from links
<if test="_parameter != null">
where is_delete=#{deleted}
</if>
</select> </select>