From 888240c86c0cb7afa3dfeb1dccd238c5f2be2b61 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 20 Jan 2022 15:20:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=87=86=E5=A4=87=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/SarStandProjectLibraryDao.java                 |  2 +-
 .../impl/SarStandProjectLibraryServiceImpl.java        | 10 +++++++++-
 .../SarStandProjectLibraryMapper.xml                   |  7 ++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
index a9b62af7..ca7feae1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
@@ -35,5 +35,5 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
         List<String> selectListByids(@Param("ids") List<String> ids);
         List<SarStandProjectLibrary> queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
 
-        List<SarStandProjectLibrary> queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
+        List<SarStandProjectLibrary> queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List<String> strings);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
index a13297fb..63c7cddc 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -135,7 +135,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
 
     @Override
     public List<SarStandProjectLibrary> queryProjects(SarStandProjectLibrary sarStandProjectLibrary) {
-        return sarStandProjectLibraryDao.queryProjects(sarStandProjectLibrary);
+        List<String> ids=new ArrayList<>();
+        if (null!=sarStandProjectLibrary.getProjectGroup() && !"".equals(sarStandProjectLibrary.getProjectGroup())){
+            if (sarStandProjectLibrary.getProjectGroup().contains(",")){
+                ids.addAll(new ArrayList<>(Arrays.asList(sarStandProjectLibrary.getProjectGroup().split(","))));
+            }else {
+                ids.add(sarStandProjectLibrary.getProjectGroup());
+            }
+        }
+        return sarStandProjectLibraryDao.queryProjects(sarStandProjectLibrary,ids);
     }
 
     @Override
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
index 0ce3a5e7..1fa348f5 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
@@ -399,6 +399,11 @@
         <if test="sarStandProjectLibrary.projectStatus != null and sarStandProjectLibrary.projectStatus != ''">
             and  sar_stand_project_library.project_status=#{sarStandProjectLibrary.projectStatus}
         </if>
-
+        <if test="null != groups and groups.size()>0">
+        and sar_stand_project_library.project_group in
+        <foreach collection="groups" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        </if>
     </select>
 </mapper>