tcm-training-admin-backend/src/main/java/com/tcm/training/admin/agent/entity/AgentRegion.java
@@ -29,9 +29,6 @@ @TableField("region_name") private String regionName; @TableField("agent_name") private String agentName; @TableField("region_level") private Integer regionLevel; tcm-training-admin-backend/src/main/java/com/tcm/training/admin/agent/service/ProvincialAgentAppService.java
@@ -41,7 +41,7 @@ LambdaQueryWrapper<ProvincialAgent> query = new LambdaQueryWrapper<ProvincialAgent>() .eq(ProvincialAgent::getDeleted, 0) .like(trim(agentName) != null, ProvincialAgent::getAgentName, trim(agentName)) .orderByDesc(ProvincialAgent::getCreatedAt).orderByDesc(ProvincialAgent::getId); .orderByAsc(ProvincialAgent::getCreatedAt).orderByDesc(ProvincialAgent::getId); if (trim(regionCode) != null) { List<Long> ids = new ArrayList<Long>(); for (AgentRegion region : regionMapper.selectList(new LambdaQueryWrapper<AgentRegion>() @@ -109,7 +109,6 @@ RegionInfo info = resolveRegion(item.getRegionCode()); AgentRegion region = new AgentRegion(); region.setAgentId(agent.getId()); region.setAgentName(agent.getAgentName()); region.setRegionCode(trim(item.getRegionCode())); region.setRegionName(info.name); region.setRegionLevel(info.path.size()); tcm-training-admin/src/pages/member/agent/index.tsx
@@ -98,10 +98,10 @@ { title: '操作', width: 180, render: (_: any, record: AgentItem) => <Space size={0}> render: (_: any, record: AgentItem, index: number) => <Space size={0}> {access['member:agent:detail'] && <Button type="link" onClick={() => openDetail(record.id)}>详情</Button>} {access['member:agent:edit'] && <Button type="link" onClick={() => openForm(record.id)}>编辑</Button>} {access['member:agent:delete'] && <Button type="link" danger onClick={() => Modal.confirm({ {access['member:agent:delete'] && !(pagination.page === 1 && index === 0) && <Button type="link" danger onClick={() => Modal.confirm({ title: '确定删除该省代理吗?', onOk: async () => { await deleteAgent(record.id); message.success('删除成功'); await load(); }, })}>删除</Button>}