From 6be3f3dd8fa2f13aa275022f7fe87f7667cf989c Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Thu, 20 Apr 2023 14:00:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E8=B5=B7=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20=E5=8F=91=E5=B8=83=E7=A8=BF=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarBussionessStandController.java         |  4 +-
 .../impl/SarBussionessStandServiceImpl.java   | 46 ++++++++++++-------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
index 849fc1f6..a819cee6 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
@@ -616,8 +616,8 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
 
     @ApiOperation(value = "通过id查询发布稿")
     @GetMapping("/selectByIdAtt")
-    public ResponseMessage selectByIdAtt (String id){
-        return sarBussionessStandEOService.selectByIdAtt(id);
+    public ResponseMessage selectByIdAtt (String ids){
+        return sarBussionessStandEOService.selectByIdAtt(ids);
     }
 }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 43fef371..ebd2e095 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -4436,24 +4436,36 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     }
 
     @Override
-    public ResponseMessage selectByIdAtt(String id) {
-
-        SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.selectByIdAtt(id);
+    public ResponseMessage selectByIdAtt(String ids) {
         List<SarBussStandAttrInfo> sarBussStandAttrInfoList = new ArrayList<>();
-        if(sarBussStandAttrInfo!=null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())){
-            String[] split = sarBussStandAttrInfo.getFbgbuss().split(",");
-            List<String> asList = Arrays.asList(split);
-            String fbgbussNmae = "";
-            for(String idInfo :asList){
-                AttFileEO byId = iAttFileEOService.getFileInfo(idInfo);
-                if(StringUtils.isNotBlank(fbgbussNmae)){
-                    fbgbussNmae = fbgbussNmae+","+byId.getOldFileName();
-                }else {
-                    fbgbussNmae = byId.getOldFileName();
-                }
-            }
-            sarBussStandAttrInfo.setFbgbussNmae(fbgbussNmae);
-            sarBussStandAttrInfoList.add(sarBussStandAttrInfo);
+        if(StringUtils.isNotBlank(ids)){
+            String[] split = ids.split(",");
+             if(split.length>0){
+                 for (String id : split){
+                     SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.selectByIdAtt(id);
+                     if(sarBussStandAttrInfo!=null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())){
+                         String[] splitInfo = sarBussStandAttrInfo.getFbgbuss().split(",");
+                         String fbgbussName = "";
+                         String fbgBuss = "";
+                         for(String idInfo :splitInfo){
+                             AttFileEO byId = iAttFileEOService.getFileInfo(idInfo);
+                             if(StringUtils.isNotBlank(fbgbussName)){
+                                 fbgbussName = fbgbussName+","+byId.getOldFileName();
+                             }else {
+                                 fbgbussName = byId.getOldFileName();
+                             }
+                             if(StringUtils.isNotBlank(fbgBuss)){
+                                 fbgBuss = fbgBuss+","+byId.getId();
+                             }else {
+                                 fbgBuss = byId.getId();
+                             }
+                         }
+                         sarBussStandAttrInfo.setFbgbussNmae(fbgbussName);
+                         sarBussStandAttrInfo.setFbgbuss(fbgBuss);
+                         sarBussStandAttrInfoList.add(sarBussStandAttrInfo);
+                     }
+                 }
+             }
         }
         return Result.success(sarBussStandAttrInfoList);
     }