From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java
index ab33f20..d4e0df7 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java
@@ -140,9 +140,18 @@
Page<Competition> competitions = competitionClient.listAudit(listQuery);
for (Competition competition : competitions.getRecords()) {
for (TStore tStore : list) {
- if(competition.getStoreId().equals(tStore.getId())){
- competition.setStoreName(tStore.getName());
+ String[] split = competition.getStoreId().split(",");
+
+ for (String s : split) {
+ if(s.equals(String.valueOf(tStore.getId()))){
+ if (competition.getStoreName()==null){
+ competition.setStoreName(tStore.getName());
+ }else {
+ competition.setStoreName(competition.getStoreName()+"，"+tStore.getName());
+ }
+ }
}
+
}
}
return super.packForBT(competitions);
--
Gitblit v1.7.1