From b6d422e0d1068533449a10be746860336de6853b Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 24 十月 2023 17:50:02 +0800
Subject: [PATCH] # 财务管理 修改
---
server/services/src/main/resources/mappers/SystemUserMapper.xml | 7 +++++++
server/services/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java | 4 ++++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java b/server/services/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
index 84785c1..799d553 100644
--- a/server/services/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
@@ -36,5 +36,9 @@
@ApiModelProperty(value = "鎵嬫満鍙风爜")
private String mobile;
+ @ApiModelProperty(value = "鐢ㄦ埛鐘舵��")
+ private Integer status;
+ @ApiModelProperty(value = "鐢ㄦ埛瑙掕壊")
+ private Integer roleId;
}
diff --git a/server/services/src/main/resources/mappers/SystemUserMapper.xml b/server/services/src/main/resources/mappers/SystemUserMapper.xml
index f8b1665..9ae4ea2 100644
--- a/server/services/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/services/src/main/resources/mappers/SystemUserMapper.xml
@@ -69,6 +69,7 @@
from "system_user" usr
left join "system_user" create_user on create_user.id = usr.create_user
left join "system_user" update_user on update_user.id = usr.update_user
+ left join "system_user_role" sur on sur.user_id = usr.id
<where>
usr.deleted = 0
<if test="dto.username != null and dto.username != ''">
@@ -80,6 +81,12 @@
<if test="dto.mobile != null and dto.mobile != ''">
AND usr.mobile LIKE '%'||#{dto.mobile}||'%'
</if>
+ <if test="dto.status != null ">
+ AND usr.status = #{dto.status}
+ </if>
+ <if test="dto.roleId != null and dto.roleId != ''">
+ AND sur.role_id = #{dto.roleId}
+ </if>
</where>
</select>
--
Gitblit v1.9.3