|
|
@@ -53,6 +53,9 @@
|
|
|
<if test="flgValidList != null and flgValidList.size>0">
|
|
|
AND ma.flg_valid =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
|
|
|
</if>
|
|
|
+ <if test="flgValid != null ">
|
|
|
+ AND ma.flg_valid = #{flgValid}
|
|
|
+ </if>
|
|
|
<if test="macTypeList != null and macTypeList.size() > 0">
|
|
|
AND ma.mac_Type =any(#{macTypeList, typeHandler=UuidListTypeHandler})
|
|
|
</if>
|
|
|
@@ -87,11 +90,12 @@
|
|
|
FROM
|
|
|
(
|
|
|
SELECT
|
|
|
+ tmdd.data_id AS "macId",
|
|
|
null AS "macType",
|
|
|
null AS "macCode",
|
|
|
tmdd.data_value AS "macName",
|
|
|
null AS "Remarks",
|
|
|
- null AS "flgValid",
|
|
|
+ 'true' AS "flgValid",
|
|
|
null AS "macTypeName",
|
|
|
null AS "macId",
|
|
|
null AS "balance",
|
|
|
@@ -101,6 +105,7 @@
|
|
|
WHERE
|
|
|
tmdd.dict_code = '账户类别' UNION ALL
|
|
|
SELECT
|
|
|
+ ma.mac_id AS "macId",
|
|
|
ma.mac_Type as "macType",
|
|
|
ma.mac_code AS "macCode",
|
|
|
ma.mac_name AS "macName",
|
dongke