|
@@ -1020,9 +1020,9 @@
|
|
|
end pid,
|
|
end pid,
|
|
|
CASE
|
|
CASE
|
|
|
WHEN node_type = 18 THEN 1
|
|
WHEN node_type = 18 THEN 1
|
|
|
- WHEN node_type = 2 THEN 2
|
|
|
|
|
- WHEN node_type = 1 THEN 0
|
|
|
|
|
- ELSE 3
|
|
|
|
|
|
|
+ WHEN node_type in(2,3) THEN 2
|
|
|
|
|
+ WHEN node_type in(4,5) THEN 3
|
|
|
|
|
+ ELSE 0
|
|
|
END nodeType,
|
|
END nodeType,
|
|
|
null levelCode,
|
|
null levelCode,
|
|
|
null partitionCatagID,
|
|
null partitionCatagID,
|
|
@@ -1033,7 +1033,7 @@
|
|
|
WHERE
|
|
WHERE
|
|
|
is_deleted = 0
|
|
is_deleted = 0
|
|
|
<if test="type != null and type == 1">
|
|
<if test="type != null and type == 1">
|
|
|
- AND node_type IN ( 1, 2, 4, 18 )
|
|
|
|
|
|
|
+ AND node_type IN ( 1, 2, 3, 4, 5, 18 )
|
|
|
</if>
|
|
</if>
|
|
|
AND status = 1
|
|
AND status = 1
|
|
|
AND type = #{type}
|
|
AND type = #{type}
|