From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java b/server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java
index f0ba404..7ab1d53 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java
@@ -26,14 +26,14 @@
List<SystemUserListVO> selectManageList(@Param("dto") QuerySystemUserDTO dto, @Param("orderByClause") String orderByClause);
- void insertBatchSomeColumn(List<SystemUser> userList);
@Select(" select c.id , c.type , c.REALNAME as realName , c.userName as userName , c.avatar ," +
" c.wechat_name as wechatName , c.mobile , c.sex , c.birthday , c.avatar , d.COMPANY_NAME_PATH as departmentName " +
" from system_user c " +
- " INNER JOIN company d on c.COMPANY_ID = d.id " +
+ " INNER JOIN company d on c.COMPANY_ID = d.id " +
+ " LEFT JOIN member m on c.member_id = m.id " +
" ${ew.customSqlSegment} ")
IPage<UserResponse> getUserPage(IPage<UserResponse> page, @Param(Constants.WRAPPER) Wrapper wrapper);
--
Gitblit v1.9.3