Administrator
2025-10-20 79cd87004c473dc9af6f3495892a932d72d039dd
feat(ai): 实现公司成员申请列表过滤及同意/解绑功能

- 在控制器中获取当前用户所属公司ID并设置到查询条件中
- 为实体类 AiCompanyMemberApply 添加 companyId 字段
- 在服务层实现根据公司编码过滤申请列表的逻辑
- 完成 agree 和 unbind 方法的具体业务逻辑处理
- 更新前端页面显示字段从 companyCode 改为 companyName
4 files modified
87 ■■■■■ changed files
src/main/java/cc/mrbird/febs/ai/controller/companyApply/AiCompanyApplyController.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/ai/entity/AiCompanyMemberApply.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/ai/service/impl/AiCompanyMemberApplyServiceImpl.java 80 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/ai/aiApply/list.html 2 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/ai/controller/companyApply/AiCompanyApplyController.java
@@ -28,7 +28,9 @@
    @GetMapping("list")
    public FebsResponse list(AiCompanyMemberApply dto, QueryRequest request) {
        String companyId = getCurrentUserCompanyId();
        dto.setCompanyId(companyId);
        Map<String, Object> data = getDataTable(service.listInPage(dto, request));
        return new FebsResponse().success().data(data);
    }
src/main/java/cc/mrbird/febs/ai/entity/AiCompanyMemberApply.java
@@ -25,4 +25,7 @@
    private String name;
    @TableField(exist = false)
    private String realName;
    @TableField(exist = false)
    private String companyId;
}
src/main/java/cc/mrbird/febs/ai/service/impl/AiCompanyMemberApplyServiceImpl.java
@@ -2,16 +2,21 @@
import cc.mrbird.febs.ai.entity.AiCompany;
import cc.mrbird.febs.ai.entity.AiCompanyMemberApply;
import cc.mrbird.febs.ai.entity.AiKnowledgeFile;
import cc.mrbird.febs.ai.entity.AiMember;
import cc.mrbird.febs.ai.mapper.AiCompanyMapper;
import cc.mrbird.febs.ai.mapper.AiCompanyMemberApplyMapper;
import cc.mrbird.febs.ai.service.AiCompanyMemberApplyService;
import cc.mrbird.febs.ai.service.AiMemberService;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -31,12 +36,17 @@
    private final MallMemberMapper mallMemberMapper;
    private final AiMemberService aiMemberService;
    private final AiCompanyMapper aiCompanyMapper;
    @Override
    public IPage<AiCompanyMemberApply> listInPage(AiCompanyMemberApply dto, QueryRequest request) {
        Page<AiCompanyMemberApply> page = new Page<>(request.getPageNum(), request.getPageSize());
        LambdaQueryWrapper<AiCompanyMemberApply> query = Wrappers.lambdaQuery(AiCompanyMemberApply.class);
        if (StrUtil.isNotEmpty(dto.getCompanyId())){
            AiCompany aiCompany = aiCompanyMapper.selectById(dto.getCompanyId());
            query.eq(AiCompanyMemberApply::getCompanyCode, aiCompany.getCode());
        }
        query.orderByDesc(AiCompanyMemberApply::getCreatedTime);
        Page<AiCompanyMemberApply> pages = this.baseMapper.selectPage(page, query);
        List<AiCompanyMemberApply> records = pages.getRecords();
@@ -65,7 +75,40 @@
    @Override
    public FebsResponse agree(AiCompanyMemberApply dto) {
        return null;
        String id = dto.getId();
        AiCompanyMemberApply aiCompanyMemberApply = this.getById(id);
        if (ObjectUtil.isEmpty(aiCompanyMemberApply)){
            throw new RuntimeException("申请不存在");
        }
        if (0 != aiCompanyMemberApply.getState()){
            throw new RuntimeException("申请已处理");
        }
        String companyCode = aiCompanyMemberApply.getCompanyCode();
        AiCompany aiCompany = aiCompanyMapper.selectOne(
                Wrappers.lambdaQuery(AiCompany.class)
                        .eq(AiCompany::getCode, companyCode)
                        .last("limit 1")
        );
        if (ObjectUtil.isEmpty(aiCompany)){
            throw new FebsException("公司编码不存在");
        }
        String memberUuid = aiCompanyMemberApply.getMemberId();
        String companyId = aiCompany.getId();
        mallMemberMapper.update(null,
                Wrappers.lambdaUpdate(MallMember.class)
                        .set(MallMember::getCompanyId, companyId)
                        .eq(MallMember::getMemberUuid, memberUuid)
        );
        aiMemberService.update(null,
                Wrappers.lambdaUpdate(AiMember.class)
                        .set(AiMember::getCompanyId, companyId)
                        .eq(AiMember::getId, memberUuid)
        );
        return new FebsResponse().success();
    }
    @Override
@@ -88,7 +131,40 @@
    @Override
    public FebsResponse unbind(AiCompanyMemberApply dto) {
        return null;
        String id = dto.getId();
        AiCompanyMemberApply aiCompanyMemberApply = this.getById(id);
        if (ObjectUtil.isEmpty(aiCompanyMemberApply)){
            throw new RuntimeException("申请不存在");
        }
        if (0 != aiCompanyMemberApply.getState()){
            throw new RuntimeException("申请已处理");
        }
        String companyCode = aiCompanyMemberApply.getCompanyCode();
        AiCompany aiCompany = aiCompanyMapper.selectOne(
                Wrappers.lambdaQuery(AiCompany.class)
                        .eq(AiCompany::getCode, companyCode)
                        .last("limit 1")
        );
        if (ObjectUtil.isEmpty(aiCompany)){
            throw new FebsException("公司编码不存在");
        }
        String memberUuid = aiCompanyMemberApply.getMemberId();
        String companyId = aiCompany.getId();
        mallMemberMapper.update(null,
                Wrappers.lambdaUpdate(MallMember.class)
                        .set(MallMember::getCompanyId, null)
                        .eq(MallMember::getMemberUuid, memberUuid)
        );
        aiMemberService.update(null,
                Wrappers.lambdaUpdate(AiMember.class)
                        .set(AiMember::getCompanyId, null)
                        .eq(AiMember::getId, memberUuid)
        );
        return new FebsResponse().success();
    }
}
src/main/resources/templates/febs/views/modules/ai/aiApply/list.html
@@ -167,7 +167,7 @@
                    {field: 'id', title: 'ID', minWidth: 100,align:'center'},
                    {field: 'name', title: '昵称', minWidth: 100,align:'center'},
                    {field: 'realName', title: '姓名', minWidth: 100,align:'center'},
                    {field: 'companyCode', title: '公司', minWidth: 100,align:'center'},
                    {field: 'companyName', title: '公司', minWidth: 100,align:'center'},
                    {field: 'createdTime', title: '时间', minWidth: 100,align:'center'},
                ]]
            });