Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

mg

2022-10-12 3f9ebf19e687c33287b0eaec64d4564a212f57db

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java

@@ -77,6 +77,10 @@
    private RedisService redisService;
    @Resource
    private UmsDepartManageMapper umsDepartManageMapper;
    @Resource
    UmsRoleMenuRelationMapper umsRoleMenuRelationMapper;
    @Resource
    AdminMenuRelationMapper adminMenuRelationMapper;

    @Override
    public UmsAdmin getAdminByUsername(String username) {
@@ -126,6 +130,31 @@
             }
            umsAdminRoleRelationService.saveBatch(roleIds);
        }
        //绑定菜单于用户
        if (!ids.isEmpty()) {
            Integer size = 0;
            Long maxId = null;
            for (Long id : ids) {
                if (size < umsRoleMenuRelationMapper
                        .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
                                .eq(UmsRoleMenuRelation::getRoleId, id)).size()) {
                    size = umsRoleMenuRelationMapper
                            .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
                                    .eq(UmsRoleMenuRelation::getRoleId, id)).size();
                    maxId = id;
                }
            }
            umsRoleMenuRelationMapper
                    .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
                            .eq(UmsRoleMenuRelation::getRoleId, maxId))
                    .stream()
                    .forEach(item->{
                        AdminMenuRelation adminMenuRelation = new AdminMenuRelation();
                        adminMenuRelation.setAdminId(umsAdmin.getId());
                        adminMenuRelation.setMenuId(item.getMenuId());
                        adminMenuRelationMapper.insert(adminMenuRelation);
                    });
        }
        //对用户名系统默认添加
        umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
        baseMapper.updateById(umsAdmin);