From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期三, 30 八月 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf
---
src/main/java/com/gk/hotwork/Mapper/mybatis/UserInfoMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Mapper/mybatis/UserInfoMapper.xml b/src/main/java/com/gk/hotwork/Mapper/mybatis/UserInfoMapper.xml
index 612b83c..a7f2e16 100644
--- a/src/main/java/com/gk/hotwork/Mapper/mybatis/UserInfoMapper.xml
+++ b/src/main/java/com/gk/hotwork/Mapper/mybatis/UserInfoMapper.xml
@@ -211,6 +211,9 @@
<if test="record.roleId != null">
and r.roleid = #{record.roleId}
</if>
+ <if test="record.companyid != null">
+ and c.id = #{record.companyid}
+ </if>
</where>
</select>
<select id="selectSuperviseUserDataList" resultMap="UserVo">
@@ -260,7 +263,7 @@
and user.realname like concat ('%',#{record.realname,jdbcType=VARCHAR},'%')
</if>
<if test="record.company != null and record.company !=''">
- and user.company like concat ('%',#{record.company,jdbcType=VARCHAR},'%')
+ and user.company like concat ('%',#{record.company},'%')
</if>
<if test="record.job != null and record.job !=''">
and user.job like concat ('%',#{record.job,jdbcType=VARCHAR},'%')
--
Gitblit v1.9.2