Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-30 730443b70de88d328ffa275f51f69280fda979e4

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

@@ -58,12 +58,12 @@
            }
            Map<String, Object> data = new HashMap<>();
            data.put("name",loginUser.get("name"));
            data.put("account", loginUser.get("account"));
            data.put("id",loginUser.get("id"));
            data.put("roleId",loginUser.get("roleId"));
            data.put("remind", remind);
            data.put("sessionLayerId",loginUser.get("sessionLayerId"));
            RoleAndMenuDto role = getRoleInfo(Long.valueOf(String.valueOf(loginUser.get("roleId"))));
            System.out.println("+++++++++++++++++++++++++++++++++++++++++++++");
            System.out.println(role);
            System.out.println("++++++++++++++++++++++++++++++++++++++++++++++");
            data.put("role",role);
            return data;
        }
@@ -94,10 +94,16 @@
    }

    @Override
    public List<Map<String, Object>> getUserNameAndId() {
    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);
    }

    @Override
    public RoleAndMenuDto getUserRoleInfo(String token) {
        return null;
    }

    @Override
@@ -126,28 +132,28 @@

    @Override
    public Integer updateNewPersonnel(UpdatePersonnelVo updatePersonnelVo) {
        User user = new User()
                .setName(updatePersonnelVo.getName())
                .setAccount(updatePersonnelVo.getAccount())
                .setAge(String.valueOf(updatePersonnelVo.getAge()))
                .setPhone(updatePersonnelVo.getPhone())
                .setEmail(updatePersonnelVo.getEmail())
                .setRoleId(updatePersonnelVo.getRole_id())
                .setPassword(updatePersonnelVo.getPassword())
                .setJobState(updatePersonnelVo.getJobState());
        LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.eq(User::getId, updatePersonnelVo.getId());
        return userMapper.update(user, updateWrapper);
        try {
            MyUtil.PrintLog(updatePersonnelVo.toString());
            User unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(updatePersonnelVo), User.class);

            LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
            updateWrapper.eq(User::getId, updatePersonnelVo.getId());
            return userMapper.update(unmarshal, updateWrapper);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }

    @Override
    public IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status) {
        MyUtil.PrintLog(name + status + "=============");
        return userMapper.getNewPersonnelPage(name, page, status);
    }


    public RoleAndMenuDto getRoleInfo(Long roleId) {
        if(roleId==0){
            return null;
        }
        RoleAndMenuDto roleAndMenuDto = roleManageMapper.selectAllRoleAndMenuByRoleId(roleId);
        List<RoleMenu> collect = roleAndMenuDto.getRoleMenuList()
                .stream()