|
@@ -36,18 +36,19 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="getWorker" resultType="com.ruoyi.gas.domain.vo.GUserForemanVo">
|
|
|
- select id as id,
|
|
|
- name as name
|
|
|
+ select id as id,
|
|
|
+ name as name
|
|
|
from g_user
|
|
|
where del_flag = '0'
|
|
|
<if test="name != null and name != ''">
|
|
|
and name LIKE CONCAT('%',#{name},'%')
|
|
|
</if>
|
|
|
- and power like '%6%'
|
|
|
<if test="type != null and type != ''">
|
|
|
+ and ( power like '%6%'
|
|
|
<foreach item="item" index="index" collection="type.split(',')">
|
|
|
- or power like CONCAT('%',#{item},'%')
|
|
|
+ or power like CONCAT('%',#{item},'%')
|
|
|
</foreach>
|
|
|
+ )
|
|
|
</if>
|
|
|
</select>
|
|
|
<select id="getBlacklist" resultType="com.ruoyi.gas.domain.vo.GUserVo">
|