From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 18:04:58 +0800
Subject: [PATCH] 修改bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionAuditController.java | 19 +++++++++++++++++--
1 files changed, 17 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 31c37e9..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
@@ -84,9 +84,15 @@
List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId()));
List<TStore> list2 = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getCityCode,competition.getCityCode()));
+ String[] split = competition.getImgs().split(",");
+ ArrayList<String> strings = new ArrayList<>();
+ for (String s : split) {
+ strings.add(s);
+ }
model.addAttribute("list",list);
model.addAttribute("list1",list1);
model.addAttribute("list2",list2);
+ model.addAttribute("imgs",strings);
model.addAttribute("type",2);
return PREFIX + "TCompetition_edit.html";
}
@@ -134,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