Compare commits
2 Commits
039508412b
...
2a05686b75
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a05686b75 | |||
| 233af57bad |
@@ -355,6 +355,7 @@ public class BatchImportSupport {
|
|||||||
// 3.1) 查询当前租户下的 companyId 映射
|
// 3.1) 查询当前租户下的 companyId 映射
|
||||||
LinkedHashMap<String, Integer> companyIdByName = new LinkedHashMap<>();
|
LinkedHashMap<String, Integer> companyIdByName = new LinkedHashMap<>();
|
||||||
LinkedHashMap<String, Integer> ambiguousByName = new LinkedHashMap<>();
|
LinkedHashMap<String, Integer> ambiguousByName = new LinkedHashMap<>();
|
||||||
|
// For display: prefer matchName (normalized) then name.
|
||||||
HashMap<Integer, String> companyNameById = new HashMap<>();
|
HashMap<Integer, String> companyNameById = new HashMap<>();
|
||||||
LinkedHashSet<String> nameSet = new LinkedHashSet<>();
|
LinkedHashSet<String> nameSet = new LinkedHashSet<>();
|
||||||
for (T row : tenantRows) {
|
for (T row : tenantRows) {
|
||||||
@@ -385,8 +386,12 @@ public class BatchImportSupport {
|
|||||||
if (c == null || c.getId() == null) {
|
if (c == null || c.getId() == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (c.getName() != null && !c.getName().trim().isEmpty()) {
|
String displayName = c.getMatchName();
|
||||||
companyNameById.putIfAbsent(c.getId(), c.getName().trim());
|
if (displayName == null || displayName.trim().isEmpty()) {
|
||||||
|
displayName = c.getName();
|
||||||
|
}
|
||||||
|
if (displayName != null && !displayName.trim().isEmpty()) {
|
||||||
|
companyNameById.putIfAbsent(c.getId(), displayName.trim());
|
||||||
}
|
}
|
||||||
addCompanyNameMapping(companyIdByName, ambiguousByName, normalizeCompanyName(c.getName()), c.getId());
|
addCompanyNameMapping(companyIdByName, ambiguousByName, normalizeCompanyName(c.getName()), c.getId());
|
||||||
addCompanyNameMapping(companyIdByName, ambiguousByName, normalizeCompanyName(c.getMatchName()), c.getId());
|
addCompanyNameMapping(companyIdByName, ambiguousByName, normalizeCompanyName(c.getMatchName()), c.getId());
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ public class GltTicketTemplateController extends BaseController {
|
|||||||
return success(gltTicketTemplateService.listRel(param));
|
return success(gltTicketTemplateService.listRel(param));
|
||||||
}
|
}
|
||||||
|
|
||||||
@PreAuthorize("hasAuthority('glt:gltTicketTemplate:list')")
|
|
||||||
@Operation(summary = "根据id查询水票")
|
@Operation(summary = "根据id查询水票")
|
||||||
@GetMapping("/{id}")
|
@GetMapping("/{id}")
|
||||||
public ApiResult<GltTicketTemplate> get(@PathVariable("id") Integer id) {
|
public ApiResult<GltTicketTemplate> get(@PathVariable("id") Integer id) {
|
||||||
|
|||||||
Reference in New Issue
Block a user