Skip to content

A
amos-boot-biz
Commit 4f8f887b authored by zhangsen's avatar zhangsen
Browse files
Options

焊工和焊机bug修改

parent f4552d91
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @ 4f8f887b
...@@ -895,6 +895,9 @@ LEFT JOIN ( ...@@ -895,6 +895,9 @@ LEFT JOIN (
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and cou.biz_org_name like concat('%', #{name}, '%') and cou.biz_org_name like concat('%', #{name}, '%')
</if> </if>
<if test="type == null or type == ''">
and cou.sequence_nbr not in (select resource_id from tz_ugp_project_resource where project_id != #{projectId} and type = 'welder')
</if>
</where> </where>
</select> </select>
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/EquipmentMapper.xml
View file @ 4f8f887b
...@@ -51,6 +51,9 @@ ...@@ -51,6 +51,9 @@
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and ue.name like concat('%', #{name}, '%') and ue.name like concat('%', #{name}, '%')
</if> </if>
<if test="type == null or type == ''">
and ue.sequence_nbr not in (select resource_id from tz_ugp_project_resource where project_id != #{projectId} and type = 'equipment')
</if>
</where> </where>
</select> </select>
...@@ -67,6 +70,7 @@ ...@@ -67,6 +70,7 @@
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and ue.name like concat('%', #{name}, '%') and ue.name like concat('%', #{name}, '%')
</if> </if>
and ue.sequence_nbr not in (select resource_id from tz_ugp_project_resource where project_id != #{projectId} and type = 'equipment')
</where> </where>
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment