From 8609ca5767d261a4e7aef1b729a29e230c24e43f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 29 一月 2026 15:13:23 +0800
Subject: [PATCH] 提交忽略文件
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 1011ee6..7559927 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -20,6 +20,7 @@
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Multifile;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.MemberService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -120,17 +121,24 @@
Member model = pageWrap.getModel();
queryWrapper.selectAll(Member.class)
.selectAs(Category::getName, Member::getLevelName)
+ .selectAs(SystemUser::getRealname, Member::getUpdateUserName)
+ .leftJoin(SystemUser.class,SystemUser::getId,Member::getUpdateUser)
.leftJoin(Category.class,Category::getId,Member::getLevelId)
.apply(Objects.nonNull(model.getBustypeIds())," find_in_set( '["+model.getBustypeIds()+"]', t.BUSTYPE_IDS ) ")
+ .apply(Objects.nonNull(model.getZhanquIds())," find_in_set( '["+model.getZhanquIds()+"]', t.ZHANQU_IDS ) ")
.like(StringUtils.isNotBlank(model.getName()),Member::getName, model.getName())
.eq(Objects.nonNull(model.getStatus()),Member::getStatus, model.getStatus())
- .orderByAsc(Objects.isNull(model.getOrderByType()),"c2.DETAIL")
+ .in(Objects.nonNull(model.getLevelId()),Member::getStatus, model.getStatus())
+ .eq(Objects.nonNull(model.getCode()),Member::getCode, model.getCode())
.orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.ZERO),Member::getFee)
.orderByAsc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.ONE),Member::getFee)
- .orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.TWO),"c2.DETAIL")
- .orderByAsc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.THREE),"c2.DETAIL")
+ .orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.TWO),Category::getDetail)
+ .orderByAsc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.THREE),Category::getDetail)
.orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.FOUR),Member::getServeNum)
;
+ if(Constants.equalsInteger(pageWrap.getModel().getQueryFlag(),Constants.ONE)){
+ queryWrapper.select("(select count(c.id) from cases c where c.deleted=0 and c.member_id=t.id)",Member::getCaseNum);
+ }
if(StringUtils.isNotBlank(model.getFieldIds())){
String [] fieldIds = model.getFieldIds().split(",");
for (String s:fieldIds) {
@@ -161,7 +169,9 @@
for (Member member:memberIPage.getRecords()) {
if(CollectionUtils.isNotEmpty(categoryList)){
dealMemberField(member,categoryList);
- dealMemberCategoryList(member,categoryList);
+ if(Constants.equalsInteger(pageWrap.getModel().getQueryFlag(),Constants.ONE)) {
+ dealMemberCategoryList(member, categoryList);
+ }
}
member.setFullImgurl(StringUtils.isNotBlank(member.getImgurl())?(path + member.getImgurl()):"");
if(StringUtils.isBlank(roleConfig)||StringUtils.isBlank(model.getQueryUserRole())
--
Gitblit v1.9.3