xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-04-25 16:15:19 +08:00
parent 3d8e2edc86
commit 1a10f18a5d
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -66,6 +66,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userName != null and userName != ''"> <if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%') AND u.user_name like concat('%', #{userName}, '%')
</if> </if>
<if test="nickName != null and nickName != ''">
AND u.nick_name like concat('%', #{nickName}, '%')
</if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
AND u.status = #{status} AND u.status = #{status}
</if> </if>

11
ruoyi-ui/src/views/components/Tools/PeopleSelect/index.vue
View File

@ -6,8 +6,7 @@
:width="width || '900px'" :width="width || '900px'"
:height="height || '650px'" :height="height || '650px'"
:before-close="handleClose" :before-close="handleClose"
append-to-body append-to-body>
>
<div class="selectBox"> <div class="selectBox">
<div class="bottomBox" v-show="showSearch"> <div class="bottomBox" v-show="showSearch">
@ -44,9 +43,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<div class="topBox"> <div class="topBox">
@ -313,7 +309,7 @@
getList() { getList() {
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.userList = response.rows; this.userList = response.rows;
// console.log(this.userList); console.log(this.userList);
} }
); );
}, },
@ -398,7 +394,6 @@
.topBox { .topBox {
width:100%; width:100%;
display: flex; display: flex;
margin-top:10px;
.leftBox { .leftBox {
width:280px; width:280px;
height: 400px; height: 400px;
@ -435,7 +430,7 @@
.bottomBox { .bottomBox {
margin-top:15px; margin-top:15px;
width:100%; width:100%;
height:75px; // height:75px;
// border: 1px solid #DCDFE6; // border: 1px solid #DCDFE6;
// -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12), 0 0 6px 0 rgba(0, 0, 0, 0.04); // -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12), 0 0 6px 0 rgba(0, 0, 0, 0.04);
// box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12), 0 0 6px 0 rgba(0, 0, 0, 0.04); // box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12), 0 0 6px 0 rgba(0, 0, 0, 0.04);