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

Administrator

2021-09-10 3ca2cf682283d3f58be80f678efedbb91260d67c

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

 src/main/java/org/springblade/modules/experience/entity/Experience.java

@@ -112,5 +112,11 @@
    @TableField("securityId")
    private String securityid;

    /**
     * 服务过的派遣单位
     */
    @TableField("server_dispatch_unit")
    private String serverDispatchUnit;


}

 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml

@@ -298,7 +298,7 @@
        on
        si.departmentid = bd.id
        where 1=1
        and bd.dept_category = 3
        and si.stats = 1
        <if test="information.deptName!=null and information.deptName!=''">
            and bd.dept_name like concat(concat('%', #{information.deptName}),'%')
        </if>

 src/main/java/org/springblade/modules/system/entity/User.java

@@ -232,4 +232,10 @@
    @TableField("paper_time")
    private Date paperTime;

    /**
     * 离职原因
     */
    @TableField("reason_for_leav")
    private String reasonForLeav;

}

 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

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

@@ -93,7 +93,7 @@
        <if test="user.status!=null and user.status != ''">
            and bu.status = #{user.status}
        </if>
        <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1123598813738675201'">
        <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
            and si.jurisdiction = #{user.jurisdiction}
        </if>
        <if test="user.realName!=null and user.realName != ''">