|
@@ -96,10 +96,12 @@
|
|
|
join dt_relation re on obj.id = re.obj_to
|
|
|
join dt_define_type df on df.code = obj.class_code
|
|
|
where obj.valid=TRUE AND obj.obj_type='component' AND re.rel_code='Eq2Ec'
|
|
|
- and df.project_id in
|
|
|
- <foreach collection="projectIds" item="projectId" open="(" close=")" separator="," >
|
|
|
- #{projectId}
|
|
|
- </foreach>
|
|
|
+ <if test="projectIds != null and projectIds.size() > 0" >
|
|
|
+ and df.project_id in
|
|
|
+ <foreach collection="projectIds" item="projectId" open="(" close=")" separator="," >
|
|
|
+ #{projectId}
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
<if test="null!=equipmentId and equipmentId.length>0">
|
|
|
AND re.obj_from=#{equipmentId}
|
|
|
</if>
|
|
@@ -138,6 +140,11 @@
|
|
|
SELECT class_code as code ,(SELECT name FROM dt_define_type WHERE code = class_code LIMIT 1 ) as name
|
|
|
FROM dt_object
|
|
|
WHERE valid=TRUE
|
|
|
+ <if test="null!=param.objTypes and param.objTypes.size()>0">
|
|
|
+ <foreach collection="param.objTypes" item="objType" open="AND obj_type IN(" close=")" separator=",">
|
|
|
+ #{objType}
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
<if test="null!=param.objType and param.objType.length>0">
|
|
|
AND obj_type=#{param.objType}
|
|
|
</if>
|