From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/system_service/src/main/java/com/doumee/dao/system/SystemUserMapper.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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 4fadb8e..6a251bc 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,8 @@
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 com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -15,7 +17,7 @@
/**
* @author T14
*/
-public interface SystemUserMapper extends BaseMapper<SystemUser> {
+public interface SystemUserMapper extends MPJBaseMapper<SystemUser> {
/**
* 鏌ヨ鐢ㄦ埛鍒楄〃
@@ -25,5 +27,29 @@
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 " +
+ " LEFT JOIN member m on c.member_id = m.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