处警人员树接口修改

Administrator

2021-05-13 4109b78cc40a6820e92322b78fcc933003f8c1f3

处警人员树接口修改

 blade-service/blade-system/pom.xml

@@ -37,6 +37,21 @@
            <artifactId>blade-user-api</artifactId>
            <version>${bladex.project.version}</version>
        </dependency>
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-common</artifactId>
            <version>${bladex.project.version}</version>
        </dependency>
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-dict-api</artifactId>
            <version>${bladex.project.version}</version>
        </dependency>
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-scope-api</artifactId>
            <version>${bladex.project.version}</version>
        </dependency>
    </dependencies>

    <build>

 blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml

@@ -79,10 +79,30 @@
        ORDER BY sort
    </select>

<!--    <select id="Batrees" resultMap="treeNodeResultMap">-->
<!--        SELECT-->
<!--            bu.id,-->
<!--            if(br.role_alias = '处警员',1,2) as parent_id,-->
<!--            bu.name AS title,-->
<!--            bu.id AS "value",-->
<!--            bu.id AS "key",-->
<!--            br.role_name roleName-->
<!--        FROM-->
<!--            blade_user bu-->
<!--            LEFT JOIN-->
<!--            blade_role br-->
<!--            ON-->
<!--            bu.role_id = br.id-->
<!--        WHERE-->
<!--                bu.is_deleted = 0-->
<!--          AND   br.role_alias = '处警员' or br.role_alias = 'admin'-->
<!--        ORDER BY-->
<!--            sort-->
<!--    </select>-->
    <select id="Batrees" resultMap="treeNodeResultMap">
        SELECT
        (SELECT
            bu.id,
            0 as parent_id,
            if(br.role_alias = '处警员', 1,2) as parent_id,
            bu.name AS title,
            bu.id AS "value",
            bu.id AS "key"
@@ -90,10 +110,38 @@
            blade_user bu
            LEFT JOIN blade_role br ON bu.role_id = br.id
        WHERE
            br.role_alias = '处警员'
            AND bu.is_deleted = 0
                bu.is_deleted = 0
          AND   br.role_alias = '处警员' or br.role_alias = 'admin'

        ORDER BY
            sort
        )


        union all

        (SELECT
                1 id,
                0 parent_id,
                '处警员' title,
                1 "value",
                1 "key"
            FROM
                blade_user bu
                    limit 1)

        union all

        (SELECT
                2 id,
                0 parent_id,
                '管理员' title,
                2 "value",
                2 "key"
            FROM
                blade_user bu
                    limit 1
        )
    </select>

    <select id="lazyTree" resultMap="treeNodeResultMap" >

 blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -23,6 +23,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.node.TreeNode;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.system.cache.SysCache;