From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 4fadb8e..f0ba404 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
@@ -7,6 +7,7 @@
import com.doumee.dao.system.dto.QuerySystemUserDTO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.vo.SystemUserListVO;
+import com.doumee.dao.system.vo.UserResponse;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -26,4 +27,28 @@
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 " +
+ " ${ew.customSqlSegment} ")
+ IPage<UserResponse> getUserPage(IPage<UserResponse> page, @Param(Constants.WRAPPER) Wrapper wrapper);
+
+ @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 " +
+ " ${ew.customSqlSegment} ")
+ List<UserResponse> getUserList(@Param(Constants.WRAPPER) Wrapper wrapper);
+
+
+ @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 " +
+ " where c.id = #{id} ")
+ UserResponse getUserInfo(@Param("id") Integer id);
}
--
Gitblit v1.9.3