This commit is contained in:
parent
daa2861f0d
commit
4f67ac7f80
|
|
@ -875,7 +875,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
mt.type_name as typeName,
|
mt.type_name as typeName,
|
||||||
mm.ma_id as maId,
|
mm.ma_id as maId,
|
||||||
mm.ma_code as maCode,
|
mm.ma_code as maCode,
|
||||||
lod.create_by as outPerson,
|
su.nick_name as outPerson,
|
||||||
lod.create_time as outTime
|
lod.create_time as outTime
|
||||||
FROM
|
FROM
|
||||||
clz_lease_out_details lod
|
clz_lease_out_details lod
|
||||||
|
|
@ -884,6 +884,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
AND mt.del_flag = '0'
|
AND mt.del_flag = '0'
|
||||||
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
|
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
|
||||||
AND mt1.del_flag = '0'
|
AND mt1.del_flag = '0'
|
||||||
|
LEFT JOIN sys_user su on su.user_id=lod.create_by
|
||||||
WHERE
|
WHERE
|
||||||
lod.parent_id = #{parentId}
|
lod.parent_id = #{parentId}
|
||||||
and mt.type_id = #{typeId}
|
and mt.type_id = #{typeId}
|
||||||
|
|
@ -1194,5 +1195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
WHERE
|
WHERE
|
||||||
lod.parent_id = #{id}
|
lod.parent_id = #{id}
|
||||||
AND lod.type_id = #{typeId}
|
AND lod.type_id = #{typeId}
|
||||||
|
AND su.sign_type IS NOT NULL
|
||||||
|
AND su.sign_url IS NOT NULL
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
@ -344,7 +344,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
FROM
|
FROM
|
||||||
bm_unit
|
bm_unit
|
||||||
WHERE bzz_idcard = #{username}
|
WHERE bzz_idcard = #{username}
|
||||||
LIMIT 1
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getToolsLedgerList"
|
<select id="getToolsLedgerList"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue