|
@@ -47,20 +47,15 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
|
|
|
, "user_id userId", "id")
|
|
|
.eq("mt_company_id", req.getMtCompanyId())
|
|
|
.orderByDesc("create_time"));
|
|
|
- //如果没有区域
|
|
|
- if (page.getRecords().isEmpty()) {
|
|
|
- return RestResponse.success();
|
|
|
- }
|
|
|
|
|
|
List<Map<String, Object>> records = regions.getRecords();
|
|
|
+ //如果没有区域
|
|
|
+ if (records.isEmpty()) {
|
|
|
+ return RestResponse.success(page);
|
|
|
+ }
|
|
|
List<Map<String, Object>> projects = baseMapper.selectProjects();
|
|
|
List<Map<String, Object>> areaCodes = baseMapper.selectAreaCodes();
|
|
|
List<Map<String, Object>> userInfos = baseMapper.selectUserInfo();
|
|
|
-
|
|
|
- if (records.isEmpty()) {
|
|
|
- return RestResponse.success();
|
|
|
- }
|
|
|
-
|
|
|
//遍历区域列表
|
|
|
for (Map<String, Object> region : records) {
|
|
|
//遍历用户列表,将user_id替换为name
|