Merge remote-tracking branch 'origin/master' into master

zengh

2021-01-11 db0b070e51db46e779b8d2ad1d4d213b712602cd

 src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml

@@ -6,13 +6,43 @@
    <resultMap id="catalogResultMap" type="org.springblade.modules.catalog.entitly.catalog">
        <id column="id" property="id"/>
        <result column="name" property="name"/>
        <result column="pid" property="pid"/>
        <result column="pId" property="pId"/>
        <result column="eqid" property="eqid"/>
    </resultMap>


    <select id="selectCatalogList" resultMap="catalogResultMap">
        SELECT id,name,pid FROM `sys_catalog`
    <select id="selectCatalogList" resultType="java.util.HashMap">
        SELECT id,name,pId FROM `sys_catalog`
    </select>

    <select id="selectCatalogEqNUmber" resultType="java.util.HashMap">

        SELECT
            *
        FROM
            sys_catalog

    </select>

    <select id="selectCount" resultType="java.util.HashMap">
        SELECT
   COUNT( * ) AS counta
FROM
   sys_alarm UNION
SELECT
   COUNT( * )
FROM
   sys_equipment
WHERE
   parent_id != 0 UNION
SELECT
   COUNT( * )
FROM
   sys_suser UNION
SELECT
   COUNT( * )
FROM
   sys_security WHERE type=1
    </select>