From 3701dcb2483643ac40d4b81c021b3d8cdab62402 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 06 九月 2024 21:50:18 +0800
Subject: [PATCH] 8.9
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
index b16e878..3699e94 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
@@ -48,6 +48,8 @@
private RegionService regionService;
@Resource
private MasterWorkerService masterWorkerService;
+ @Resource
+ private SiteService siteService;
/**
* 加盟商信息分页列表
@@ -74,8 +76,19 @@
wrapper = StringUtils.isNotBlank(head) ? wrapper.like(Franchisee::getHead, head) : wrapper;
wrapper = StringUtils.isNotBlank(phone) ? wrapper.like(Franchisee::getHeadPhone, phone) : wrapper;
wrapper = StringUtils.isNotBlank(city) ? wrapper.like(Franchisee::getCity, city) : wrapper;
- return R.ok(wrapper.eq(Franchisee::getIsDelete, 0)
- .orderByDesc(Franchisee::getCreateTime).page(Page.of(pageNum, pageSize)));
+ Page<Franchisee> page = wrapper.eq(Franchisee::getIsDelete, 0)
+ .orderByDesc(Franchisee::getCreateTime).page(Page.of(pageNum, pageSize));
+ for (Franchisee record : page.getRecords()) {
+ if (record.getSiteIds()!=null){
+ String[] split = record.getSiteIds().split(",");
+ List<Site> list = siteService.lambdaQuery().in(Site::getId, split).list();
+ //用 , 拼接
+ record.setSiteStr(list.stream().map(Site::getSiteName).collect(Collectors.joining(",")));
+ }
+
+
+ }
+ return R.ok(page);
}
/**
--
Gitblit v1.7.1