修改角色创建人问题 导办人员筛选 bug

lidongdong

2022-10-19 fc56ad34e7110c2da5d81459bf9ad37f98988b04

修改角色创建人问题  导办人员筛选  bug

 flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java

@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.RoleManagementEntity;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IRoleManagementService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -61,9 +63,9 @@
    @ApiOperation("新增角色")
    @PostMapping("/add")
    @Authorization
    public ResultData insertConfig(@RequestBody RoleManagementEntity entity)
    public ResultData insertConfig(@RequestBody RoleManagementEntity entity, @CurrentUser SysUser sysUser)
    {
//        entity.setCreateUserId(sysUser.getUserId()+"");
        entity.setCreateUserId(sysUser.getUserId()+"");
        return toAjax(iRoleManagementService.insertConfig(entity));
    }


 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -171,14 +171,14 @@
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "userName",required = false) String userName)
                                          @RequestParam(value = "keyword",required = false) String keyword)
    {
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",userName);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword);

        int num=IUserService.selectNum("3",userName);
        int num=IUserService.selectNum("3",keyword);
        return getDataTable(list,num);
    }


 flower_city/src/main/java/com/dg/core/db/gen/entity/RoleManagementEntity.java

@@ -1,6 +1,7 @@
package com.dg.core.db.gen.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -66,6 +67,10 @@
    @ApiModelProperty("权限")
    private String permission;

    @TableField(exist = false)
    @ApiModelProperty("创建者名称")
    private String createName;



}

 flower_city/src/main/resources/mapper/RoleManagementMapper.xml

@@ -21,6 +21,7 @@
            create_time,
            update_time,
            create_user_id,
            (select user_name from automessage_sys_user where create_user_id=automessage_sys_user.user_id) as createName,
            update_user_id
        FROM
            automessage_role_management

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -100,8 +100,8 @@
            <if test="userName != null and userName != ''">
                AND user_name like concat('%', #{userName}, '%') or
                (department_id in (SELECT id FROM automessage_organization_chart
                WHERE organization_name like concat('%', #{userName}, '%')))

                WHERE organization_name like concat('%', #{userName}, '%'))) or
                phonenumber like concat('%', #{userName}, '%')
            </if>
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}
@@ -126,8 +126,8 @@
            <if test="userName != null and userName != ''">
                AND user_name like concat('%', #{userName}, '%') or
                (department_id in (SELECT id FROM automessage_organization_chart
                WHERE organization_name like concat('%', #{userName}, '%')))

                WHERE organization_name like concat('%', #{userName}, '%'))) or
                phonenumber like concat('%', #{userName}, '%')
            </if>
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}