From f02445246354c71e586937d3df4c72ed16420294 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 26 六月 2025 18:17:45 +0800
Subject: [PATCH] 代码初始化
---
server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index 0d52a93..0a045a9 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -260,6 +260,7 @@
.eq(SystemUser::getDeleted,Constants.ZERO)
.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
.leftJoin(Member.class,Member::getId,SystemUser::getMemberId)
+ .leftJoin(" position p on p.id = t2.POSITION_ID ")
.and(StringUtils.isNotBlank(systemUser.getUsername()),ms->ms.like(SystemUser::getUsername,systemUser.getUsername())
.or().like(SystemUser::getMobile,systemUser.getUsername())
.or().like(SystemUser::getRealname,systemUser.getUsername()))
@@ -275,7 +276,8 @@
.like(StringUtils.isNotBlank(systemUser.getUsername()),SystemUser::getUsername,systemUser.getUsername())
.like(StringUtils.isNotBlank(systemUser.getCompanyName()),Company::getName,systemUser.getCompanyName())
.apply(StringUtils.isNotBlank(systemUser.getCompanySpecialId())," find_in_set('"+systemUser.getCompanySpecialId()+"',REPLACE(t1.company_path,'/',','))")
- .orderByAsc( Company::getPinyin )
+ .orderByAsc( Company::getSortnum )
+ .orderByAsc( " p.SORTNUM " )
.orderByAsc(SystemUser::getPinyin)
;
List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, wrapper);
@@ -302,9 +304,12 @@
MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(SystemUser.class);
queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO);
- queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
- queryWrapper.eq(Company::getType,Constants.ONE);
- queryWrapper.orderByAsc(SystemUser::getPinyin);
+ queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+ .leftJoin(" position p on p.id = t2.POSITION_ID ");
+ queryWrapper.eq(Company::getType,Constants.ONE)
+ .orderByAsc( Company::getSortnum )
+ .orderByAsc( " p.SORTNUM " )
+ .orderByAsc(SystemUser::getPinyin);
List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, queryWrapper);
return result;
}
--
Gitblit v1.9.3