From 60e49d600834344ae1b18357e76df74fbe160527 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 二月 2026 10:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/CasesServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/CasesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/CasesServiceImpl.java
index 74b8099..76551cc 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/CasesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/CasesServiceImpl.java
@@ -179,12 +179,13 @@
MPJLambdaWrapper<Cases> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Cases.class)
.selectAs(Member::getName,Cases::getMemberName)
+ .selectAs(Member::getCode,Cases::getMemberCode)
.selectAs(SystemUser::getRealname, Member::getUpdateUserName)
.leftJoin(SystemUser.class,SystemUser::getId,Cases::getUpdateUser)
.leftJoin(Member.class,Member::getId,Cases::getMemberId);
Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.eq(pageWrap.getModel().getContainDeleted()!=1,Cases::getDeleted, Constants.ZERO);
queryWrapper.eq(pageWrap.getModel().getId() != null,Cases::getId, pageWrap.getModel().getId());
- queryWrapper.eq(pageWrap.getModel().getDeleted() != null,Cases::getDeleted, pageWrap.getModel().getDeleted());
queryWrapper.eq(pageWrap.getModel().getCreateUser() != null,Cases::getCreateUser, pageWrap.getModel().getCreateUser());
queryWrapper.eq(pageWrap.getModel().getUpdateUser() != null,Cases::getUpdateUser, pageWrap.getModel().getUpdateUser());
queryWrapper.eq(pageWrap.getModel().getRemark() != null,Cases::getRemark, pageWrap.getModel().getRemark());
@@ -209,7 +210,7 @@
}
private void initMultifileList(Cases cate) {
String path = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode()
- + systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.CATEGORY_FILES).getCode();
+ + systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.CASES_FILES).getCode();
Multifile find = new Multifile();
find.setObjId(cate.getId());
--
Gitblit v1.9.3