From 8b3c26e2a7d78f42a749dbf399d11bb029648f97 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 20 九月 2023 10:07:22 +0800
Subject: [PATCH] sessionkey更换
---
server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java | 15 +++++++++++----
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 4 ++--
server/platform/src/main/java/com/doumee/api/business/FileRecordController.java | 4 +++-
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/FileRecordController.java b/server/platform/src/main/java/com/doumee/api/business/FileRecordController.java
index a7327ce..b004b7f 100644
--- a/server/platform/src/main/java/com/doumee/api/business/FileRecordController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/FileRecordController.java
@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.FileRecord;
import com.doumee.service.business.FileRecordService;
import io.swagger.annotations.Api;
@@ -69,8 +70,9 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("business:filerecord:query")
+// @RequiresPermissions("business:filerecord:query")
public ApiResponse<PageData<FileRecord>> findPage (@RequestBody PageWrap<FileRecord> pageWrap) {
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
return ApiResponse.success(fileRecordService.findPage(pageWrap));
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
index d826fc3..3fcbe43 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -411,7 +411,7 @@
updateModel.lambda().set(Multifile::getIsdeleted,Constants.ONE);
updateModel.lambda().set(Multifile::getEditDate, new Date());
updateModel.lambda().in(Multifile::getObjId, goodsIdList);
- updateModel.lambda().eq(Multifile::getObjType, Constants.ZERO);
+ updateModel.lambda().eq(Multifile::getObjType, Constants.ONE);
multifileMapper.delete(updateModel);
//鍒犻櫎鍘熸湁鍟嗗搧灞炴��
UpdateWrapper<BaseGoodsParam> bgModel = new UpdateWrapper<>();
@@ -466,7 +466,7 @@
if(StringUtils.isNotBlank(img)){
Multifile f = new Multifile();
f.setFileurl(img);
- f.setObjType(Constants.ZERO);
+ f.setObjType(Constants.ONE);
f.setName(bgImg.substring(bgImg.lastIndexOf("/")+1));
f.setType(Constants.ZERO);
f.setObjId(id);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java
index 7926562..29f8cc1 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java
@@ -152,7 +152,7 @@
queryWrapper.lambda().eq(FileRecord::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(FileRecord::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(FileRecord::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getInfo() != null) {
queryWrapper.lambda().eq(FileRecord::getInfo, pageWrap.getModel().getInfo());
@@ -164,18 +164,25 @@
queryWrapper.lambda().eq(FileRecord::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getFolder() != null) {
- queryWrapper.lambda().eq(FileRecord::getFolder, pageWrap.getModel().getFolder());
+ queryWrapper.lambda().like(FileRecord::getFolder, pageWrap.getModel().getFolder());
}
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(FileRecord::getStatus, pageWrap.getModel().getStatus());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (pageWrap.getModel().getKeyval() != null) {
+ queryWrapper.lambda().like(FileRecord::getKeyval, pageWrap.getModel().getKeyval());
+ }
+ if (pageWrap.getModel().getUrl() != null) {
+ queryWrapper.lambda().like(FileRecord::getUrl, pageWrap.getModel().getUrl());
+ }
+ /* for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
} else {
queryWrapper.orderByAsc(sortData.getProperty());
}
- }
+ }*/
+ queryWrapper.lambda().orderByAsc(FileRecord::getStatus);
return PageData.from(fileRecordMapper.selectPage(page, queryWrapper));
}
--
Gitblit v1.9.3