From 4b2ac3fcec0c32ed8277f209c6ac7261e6f66945 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 25 Aug 2021 17:03:21 +0800
Subject: [PATCH] 1.备案
---
src/main/java/org/springblade/modules/resource/mapper/AttachMapper.xml | 5 ++++-
src/main/java/org/springblade/modules/resource/service/IAttachService.java | 2 +-
src/main/java/org/springblade/modules/resource/controller/AttachController.java | 4 ++--
src/main/java/org/springblade/modules/resource/service/impl/AttachServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/resource/mapper/AttachMapper.java | 2 +-
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/resource/controller/AttachController.java b/src/main/java/org/springblade/modules/resource/controller/AttachController.java
index e4a4d54..48e0b34 100644
--- a/src/main/java/org/springblade/modules/resource/controller/AttachController.java
+++ b/src/main/java/org/springblade/modules/resource/controller/AttachController.java
@@ -84,8 +84,8 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入attach")
- public R<IPage<AttachVO>> page(AttachVO attach, Query query) {
- IPage<AttachVO> pages = attachService.selectAttachPage(Condition.getPage(query), attach);
+ public R<IPage<AttachVO>> page(AttachVO attach, Query query,String deptid, String type,String cardid) {
+ IPage<AttachVO> pages = attachService.selectAttachPage(Condition.getPage(query), attach,type,cardid);
return R.data(pages);
}
diff --git a/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.java b/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.java
index 7f5bf02..e1c86c1 100644
--- a/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.java
+++ b/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.java
@@ -36,6 +36,6 @@
* @param attach
* @return
*/
- List<AttachVO> selectAttachPage(IPage page, AttachVO attach);
+ List<AttachVO> selectAttachPage(IPage page, AttachVO attach,String type,String cardid);
}
diff --git a/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.xml b/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.xml
index a73014e..22b7db7 100644
--- a/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.xml
+++ b/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.xml
@@ -24,7 +24,10 @@
<select id="selectAttachPage" resultMap="attachResultMap">
- select * from blade_attach where is_deleted = 0
+ select * from blade_attach where is_deleted = 0 and cardid=#{cardid} and type=#{type}
+ <if test="attach.originalName!='' and attach.originalName!=null">
+ and original_name like concat('%', #{attach.originalName},'%')
+ </if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/resource/service/IAttachService.java b/src/main/java/org/springblade/modules/resource/service/IAttachService.java
index 347442d..fdabd93 100644
--- a/src/main/java/org/springblade/modules/resource/service/IAttachService.java
+++ b/src/main/java/org/springblade/modules/resource/service/IAttachService.java
@@ -35,6 +35,6 @@
* @param attach
* @return
*/
- IPage<AttachVO> selectAttachPage(IPage<AttachVO> page, AttachVO attach);
+ IPage<AttachVO> selectAttachPage(IPage<AttachVO> page, AttachVO attach,String type,String cardid);
}
diff --git a/src/main/java/org/springblade/modules/resource/service/impl/AttachServiceImpl.java b/src/main/java/org/springblade/modules/resource/service/impl/AttachServiceImpl.java
index 46bd0ce..46c8d9e 100644
--- a/src/main/java/org/springblade/modules/resource/service/impl/AttachServiceImpl.java
+++ b/src/main/java/org/springblade/modules/resource/service/impl/AttachServiceImpl.java
@@ -33,8 +33,8 @@
public class AttachServiceImpl extends BaseServiceImpl<AttachMapper, Attach> implements IAttachService {
@Override
- public IPage<AttachVO> selectAttachPage(IPage<AttachVO> page, AttachVO attach) {
- return page.setRecords(baseMapper.selectAttachPage(page, attach));
+ public IPage<AttachVO> selectAttachPage(IPage<AttachVO> page, AttachVO attach,String type,String cardid) {
+ return page.setRecords(baseMapper.selectAttachPage(page, attach,type,cardid));
}
}
--
Gitblit v1.9.3