|
@@ -50,7 +50,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="xDetail" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
|
|
- select <include refid="Base_Column_List"/>, d.name as departmentName from item i left join department d on d.id = i.department_id where i.deleted = 0 and d.deleted=0 and i.id =#{id}
|
|
|
+ select <include refid="Base_Column_List"/>, d.name as departmentName from item i left join department d on d.id = i.department_id where i.deleted = 0 and i.id =#{id}
|
|
|
</select>
|
|
|
|
|
|
<select id="selectItemUserId" parameterType="java.lang.Long" resultType="java.lang.Long">
|
|
@@ -66,8 +66,6 @@
|
|
|
item i left join department d on i.department_id = d.id
|
|
|
WHERE
|
|
|
i.deleted = 0
|
|
|
- and
|
|
|
- d.deleted = 0
|
|
|
<if test="item!=null and item.name!=null and item.name!='' ">
|
|
|
and i.name like concat ('%',#{item.name},'%')
|
|
|
</if>
|