权限修改4.0

Fixiaobai

2023-08-28 2bdecf28a44019b125fe8e62a8ee4ea114418eea

权限修改4.0

 user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java

@@ -55,6 +55,9 @@
    @ApiModelProperty(value = "个性签名")
    private String info;

    @ApiModelProperty(value = "类型")
    private Integer type;

    @ApiModelProperty(value = "在职状态 正常>=1,离职<=0")
    private Integer jobState;


 user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java

@@ -96,7 +96,7 @@
    @Override
    public List<Map<String, Object>> getUserNameAndId() {
        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
        wrapper.select(User::getId, User::getName);
        wrapper.select(User::getId, User::getName).eq(User::getType,1);
        return userMapper.selectMaps(wrapper);
    }


 user-server/src/main/resources/mapper/UserMapper.xml

@@ -15,11 +15,13 @@
             `user` u
        WHERE e.`id` = u.`enterprise_id`
          AND u.id = #{userId}
          and type = 1
    </select>


    <select id="getNewPersonnelPage" resultType="map">
        SELECT u.`id`, u.`name` username, r.`name` roleName, DATE_FORMAT(u.`create_time`, '%Y-%m-%d') createTime, u.`age`,
        SELECT u.`id`, u.`name` username, r.`name` roleName, DATE_FORMAT(u.`create_time`, '%Y-%m-%d') createTime,
        u.`age`,
        u.`phone`, u.`email`, u.`job_state` jobState, o.`department`, u.`account`, o.`id` departmentId
        FROM `user` u
        LEFT JOIN role r