代码提交
This commit is contained in:
parent
0774d7f588
commit
3b3afebb93
|
|
@ -272,9 +272,7 @@
|
||||||
<if test="maType != null and maType != ''">
|
<if test="maType != null and maType != ''">
|
||||||
and mat2.`NAME` like concat ('%',#{maType},'%')
|
and mat2.`NAME` like concat ('%',#{maType},'%')
|
||||||
</if>
|
</if>
|
||||||
<if test="isCount != null and isCount != ''">
|
|
||||||
and rs.isCount = #{isCount}
|
|
||||||
</if>
|
|
||||||
</where>
|
</where>
|
||||||
GROUP BY rs.typeId
|
GROUP BY rs.typeId
|
||||||
) a WHERE
|
) a WHERE
|
||||||
|
|
@ -287,6 +285,9 @@
|
||||||
mt.`LEVEL` = 4
|
mt.`LEVEL` = 4
|
||||||
AND mt.IS_ACTIVE = 1
|
AND mt.IS_ACTIVE = 1
|
||||||
)
|
)
|
||||||
|
<if test="isCount != null and isCount != ''">
|
||||||
|
and a.isCount = #{isCount}
|
||||||
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue