从业记录，组织机构类别去除

Administrator

2021-09-10 3ca2cf682283d3f58be80f678efedbb91260d67c

 src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml

@@ -339,9 +339,6 @@
                        si.departmentid = dept.id
                    WHERE
                        dept.is_deleted = 0
                    <if test="type==1">
                        and dept_category=1
                    </if>
                    <if test="deptId!=null and deptId!=''">
                        and dept.id = #{deptId}
                    </if>
@@ -369,11 +366,7 @@
                and bu.is_deleted = 0
                and bu.status = 1
                <if test="type==1">
                    and dept_category=1
                    and role_alias = '保安'
                </if>
                <if test="type==2 or type==3">
                    and dept_category=2
                </if>
                <if test="deptId!=null and deptId!=''">
                    and bu.dept_id = #{deptId}
@@ -412,9 +405,6 @@
                        si.departmentid = dept.id
                    WHERE
                        dept.is_deleted = 0
                    <if test="type==2  or type==3">
                        and dept_category=2
                    </if>
                    <if test="deptId!=null and deptId!=''">
                        and (dept.parent_id = #{deptId} or dept.id = #{deptId})
                    </if>
@@ -436,9 +426,7 @@
                bd.id = bu.dept_id
                where 1=1
                and bu.is_deleted = 0
                <if test="type==2 or type==3">
                    and dept_category=2
                </if>
        and bu.status = 1
                <if test="deptId!=null and deptId!=''">
                    and (bd.parent_id = #{deptId} or bd.id = #{deptId})
                </if>
@@ -473,8 +461,8 @@
                        si.departmentid = dept.id
                    WHERE
                        dept.is_deleted = 0
                    <if test="type==2  or type==3">
                        and dept_category=2
        <if test="deptId!=null and deptId!=''">
            and  dept.id = #{deptId}
                    </if>
            )

@@ -494,8 +482,9 @@
                bd.id = bu.dept_id
                where 1=1
                and bu.is_deleted = 0
                <if test="type==2 or type==3">
                    and dept_category=2
        and bu.status = 1
        <if test="deptId!=null and deptId!=''">
            and  bd.id = #{deptId}
                </if>
            )
        )c