南昌市物联网技防平台-后台
Administrator
2021-04-12 48ca388f8e5ff6e5ecc972e1d12b3f128cb98e3e
处警队伍管理列表接口修改,新增部门,处警员状态信息
3 files modified
26 ■■■■ changed files
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml 21 ●●●● patch | view | raw | blame | history
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java 1 ●●●● patch | view | raw | blame | history
blade-service/blade-user/src/main/java/org/springblade/system/user/vo/UsersVo.java 4 ●●●● patch | view | raw | blame | history
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -137,13 +137,24 @@
    <!--查询处警人员列表-->
    <select id="selectSecurityUserPageList" resultType="org.springblade.system.user.vo.UsersVo">
        SELECT bu.*,p.jd,p.wd FROM blade_user bu
            LEFT JOIN
        SELECT bu.id,bu.name,bu.code,bu.real_name realName,bu.account,
            bu.email,bu.phone,bu.birthday,bu.create_time createTime,
            bu.sex,ifnull(bu.online_status,0) online_status,
        bd.dept_name deptName,p.jd,p.wd FROM blade_user bu
        LEFT JOIN
        jfpt.sys_position p
            on
        on
        p.snumber=bu.code
            where
        role_id = #{user.roleId}
        left join
        blade_dept bd
        on
        bd.id=bu.dept_id
        left join
        blade_role br
        on
        bu.role_id=br.id
        where
        br.role_alias ='处警员'
        <if test="user.realName!=null and user.realName !=''">
            <bind name="realName" value="'%'+user.realName+'%'"/>
            and bu.real_name like #{realName}
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -313,6 +313,7 @@
    @Override
    public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
        List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
        userList.forEach(user -> {
            user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
blade-service/blade-user/src/main/java/org/springblade/system/user/vo/UsersVo.java
@@ -8,5 +8,9 @@
    private static final long serialVersionUID = 1L;
    private  String jd;
    private  String wd;
    /**
     * 部门名称
     */
    private String deptName;
    private  String coordinate;
}