From acf90ad8e6bea592124541324467360cef565ff5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 06 二月 2026 14:14:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dianjiang
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 f74f6c1..5e1af2d 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
@@ -225,7 +225,7 @@
.eq(Objects.nonNull(model.getImportId()),Member::getImportId, model.getImportId())
.eq(Objects.nonNull(model.getStatus()),Member::getStatus, model.getStatus())
.eq(model.getContainDeleted()!=1,Member::getDeleted, Constants.ZERO)
- .in(Objects.nonNull(model.getLevelId()),"t1.id", model.getLevelId())
+ .in(Objects.nonNull(model.getLevelId()),"t2.id", model.getLevelId())
.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)
@@ -243,7 +243,7 @@
) {
sql = sql + (StringUtils.isNotBlank(sql)?" or ":"") + " find_in_set( '["+s+"]' , t.FIELD_IDS ) ";
}
- queryWrapper.apply(sql);
+ queryWrapper.apply("("+sql+")");
}
@@ -253,18 +253,22 @@
) {
sql = sql + (StringUtils.isNotBlank(sql)?" or ":"") + " find_in_set( '["+s+"]' , t.BUSTYPE_IDS ) ";
}
- queryWrapper.apply(sql);
+ queryWrapper.apply("("+sql+")");
}
if (StringUtils.isNotBlank(model.getQueryZQCode())) {
- Category zhanqu = categoryMapper.selectOne(new QueryWrapper<Category>().lambda()
+ List<Category> zhanquList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
.eq(Category::getDeleted,Constants.ZERO)
.eq(Category::getStatus,Constants.ZERO)
- .eq(Category::getDetail,model.getQueryZQCode())
+ .apply(" find_in_set(detail,'"+model.getQueryZQCode()+"') ")
.last(" limit 1")
);
- if(Objects.nonNull(zhanqu)){
- queryWrapper.apply(" find_in_set( '["+zhanqu.getId()+"]', t.ZHANQU_IDS ) ");
+ if(CollectionUtils.isNotEmpty(zhanquList)){
+ String sql = "";
+ for (Category s:zhanquList) {
+ sql = sql + (StringUtils.isNotBlank(sql)?" or ":"") + " find_in_set( '["+s.getId()+"]' , t.ZHANQU_IDS ) ";
+ }
+ queryWrapper.apply("("+sql+")");
}
}
IPage<Member> memberIPage = memberMapper.selectJoinPage(page, Member.class, queryWrapper);
@@ -285,7 +289,9 @@
if(member.getJobYear()!=null){
member.setWorkYears(DateUtil.getCurrentYear( ) - member.getJobYear()+1);
}
+ member.setServeNum(Constants.formatIntegerNum(member.getServeNum()));
}
+
}
return PageData.from(memberIPage);
}
@@ -373,7 +379,7 @@
.eq(Multifile::getObjId,cases.getId())
.eq(Multifile::getObjType,Constants.ONE)
.eq(Multifile::getIsdeleted,Constants.ZERO)
- .orderByDesc(Multifile::getId)
+ .orderByAsc(Multifile::getId)
);
multifileList.forEach(multifile -> {
multifile.setUrl(StringUtils.isNotBlank(multifile.getFileurl())?(resourcePath + casePath + multifile.getFileurl()):"");
--
Gitblit v1.9.3