From 083a8379e500b8c3d8224405f904386a09dae3f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Mon, 2 Aug 2021 22:25:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=BC=82=E5=B8=B8=E6=8F=90?=
 =?UTF-8?q?=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java    | 2 +-
 .../mesnac/meapi/service/impl/NcCodeServiceImpl.java        | 6 +++++-
 meapi/src/main/resources/mapper/NcCodeMapper.xml            | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java
index bff2bf4b..638b8ae5 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java
@@ -39,5 +39,5 @@ public interface NcCodeMapper extends BaseMapper<NcCode> {
     List<NcCode> findNcCodeByNcGroup(@Param("ncGroup")NcGroup ncGroup);
 
 
-    List<NcCodeDto> findNcCodeDescriptionByNcCode(@Param("site")String site, @Param("locale")String locale, @Param("ncCode")String ncCode);
+    List<NcCodeDto> findNcCodeDescriptionByNcCode(@Param("site")String site, @Param("locale")String locale, @Param("ncCode")String[] ncCode);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java
index fa1e9033..e8b1b57c 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java
@@ -19,6 +19,7 @@ import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -86,7 +87,10 @@ public class NcCodeServiceImpl extends ServiceImpl<NcCodeMapper, NcCode> impleme
     public List<NcCodeDto> findNcCodeDescriptionByNcCode(String ncCode) {
         String site = CommonMethods.getSite();
         String locale = LocaleContextHolder.getLocale().getLanguage();
-        return ncCodeMapper.findNcCodeDescriptionByNcCode(site,locale,ncCode);
+        ArrayList<String> ncCodeList = new ArrayList<>();
+        String[] split = ncCode.split(",");
+
+        return ncCodeMapper.findNcCodeDescriptionByNcCode(site,locale,split);
     }
 
 
diff --git a/meapi/src/main/resources/mapper/NcCodeMapper.xml b/meapi/src/main/resources/mapper/NcCodeMapper.xml
index e25daaf2..f5408f42 100644
--- a/meapi/src/main/resources/mapper/NcCodeMapper.xml
+++ b/meapi/src/main/resources/mapper/NcCodeMapper.xml
@@ -428,7 +428,10 @@
         LEFT JOIN NC_GROUP_MEMBER NGM ON NGM.NC_CODE_OR_GROUP_GBO = NC.HANDLE
         LEFT JOIN NC_GROUP NG ON NG.HANDLE = NGM.NC_GROUP_BO
         <where>
-            NC.SITE = #{site} AND NC.NC_CODE IN UPPER(${ncCode})
+            NC.SITE = #{site} AND NC.NC_CODE IN
+            <foreach collection="ncCode" open="(" close=")" item="item" separator=",">
+                UPPER(#{item})
+            </foreach>
         </where>
     </select>
 </mapper>