From 4826332deb2bc8ec3e5cd1d53fa38466c103225c Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 20 Jan 2022 15:05:23 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=20=E5=87=86=E5=A4=87=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandProjectLibraryController.java     | 15 +++++++++
 .../dao/SarStandProjectLibraryDao.java        |  3 ++
 .../SarStandProjectLibraryService.java        |  3 ++
 .../SarStandProjectLibraryServiceImpl.java    | 10 ++++++
 .../SarStandProjectLibraryMapper.xml          | 33 +++++++++++++++++++
 5 files changed, 64 insertions(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
index 02888d99..0cd08aa5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
@@ -343,4 +343,19 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
                 .build();
         return Result.success(querySelectRspDTO);
     }
+    //标准评估流程 查询项目群接口
+    @GetMapping("/queryProjectGroup")
+    @ApiOperation("查询项目群")
+    public ResponseMessage queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary){
+        return Result.success( sarStandProjectLibraryService.queryProjectGroup(sarStandProjectLibrary));
+    }
+    //标准评估流程根据项目群查项目接口
+    @GetMapping("/queryProjects")
+    @ApiOperation("查询项目群下的项目")
+    public ResponseMessage queryProjects(SarStandProjectLibrary sarStandProjectLibrary){
+        return Result.success( sarStandProjectLibraryService.queryProjects(sarStandProjectLibrary));
+    }
+
+
+
 }
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 f5a92dab..a9b62af7 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
@@ -33,4 +33,7 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
         void deleteByProjectId(@Param("projectId")String projectId);
 
         List<String> selectListByids(@Param("ids") List<String> ids);
+        List<SarStandProjectLibrary> queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
+
+        List<SarStandProjectLibrary> queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java
index 85ed659b..72f916ab 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java
@@ -29,5 +29,8 @@ public interface SarStandProjectLibraryService {
     void batchInsertAdd(@Param("ids") List<StandProjectRelationDto> list);
     List<StandAttrInfoDto> exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId);
     public Head AnalysisJsonAndStorage(String jsonStr);
+    public List<SarStandProjectLibrary> queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
+
+    public List<SarStandProjectLibrary> queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
 
 }
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 293ed9fd..a13297fb 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
@@ -128,6 +128,16 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         return head;
     }
 
+    @Override
+    public List<SarStandProjectLibrary> queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary) {
+        return sarStandProjectLibraryDao.queryProjectGroup(sarStandProjectLibrary);
+    }
+
+    @Override
+    public List<SarStandProjectLibrary> queryProjects(SarStandProjectLibrary sarStandProjectLibrary) {
+        return sarStandProjectLibraryDao.queryProjects(sarStandProjectLibrary);
+    }
+
     @Override
     public IPage<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize,
                                                                  SarStandProjectLibraryDto sarDto) {
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 660d2263..0ce3a5e7 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
@@ -368,4 +368,37 @@
             #{item}
         </foreach>
     </select>
+    <select id="queryProjectGroup"
+            resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
+        select distinct sar_stand_project_library.project_group from sar_stand_project_library
+        where 1=1
+        <if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
+          and  sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}
+        </if>
+        <if test="sarStandProjectLibrary.developmentHostName != null and sarStandProjectLibrary.developmentHostName != ''">
+          and  sar_stand_project_library.development_host_name=#{sarStandProjectLibrary.developmentHostName}
+        </if>
+        <if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
+          and  sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
+        </if>
+    </select>
+    <select id="queryProjects"
+            resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
+      select sar_stand_project_library.* , ts_user.UNAME as uName from sar_stand_project_library
+      left join ts_user on ts_user.USID = sar_stand_project_library.project_manager
+      where 1=1
+        <if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
+            and  sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}
+        </if>
+        <if test="sarStandProjectLibrary.developmentHostName != null and sarStandProjectLibrary.developmentHostName != ''">
+            and  sar_stand_project_library.development_host_name=#{sarStandProjectLibrary.developmentHostName}
+        </if>
+        <if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
+            and  sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
+        </if>
+        <if test="sarStandProjectLibrary.projectStatus != null and sarStandProjectLibrary.projectStatus != ''">
+            and  sar_stand_project_library.project_status=#{sarStandProjectLibrary.projectStatus}
+        </if>
+
+    </select>
 </mapper>

From f3101d6e74b4904da5c2d335108adcd007c048f0 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 20 Jan 2022 15:07:55 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=A6=E6=83=85=20?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BAtextStatu?=
 =?UTF-8?q?sBussShow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slrs/sarBussionessStand/entity/SarBussionessStand.java  | 3 +++
 .../mapper/sarBussionessStand/SarBussionessStandMapper.xml  | 4 +++-
 .../com/adc/da/sys/controller/DicTypeEORestController.java  | 6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
index 7b663965..2d6502fe 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
@@ -153,6 +153,9 @@ public class SarBussionessStand extends BaseEntity {
     @TableField(exist = false)
     private String menuParentId;
 
+    @TableField(exist = false)
+    private String textStatusBussShow;
+
     @TableField(exist = false)
     private String standStatusShow; // 标准状态下拉框   --单选
 
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
index 38a70316..7abb5fd4 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
@@ -21,6 +21,7 @@
         <result column="stand_sort" property="standSort" />
         <result column="stand_year" property="standYear" />
         <result column="text_status_buss" property="textStatusBuss" />
+        <result column="text_status_buss_show" property="textStatusBussShow"/>
     </resultMap>
 
     <resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
@@ -748,12 +749,13 @@
 
     <!-- 根据id查询 SAR_BUSSIONESS_STAND 的详细信息-->
     <select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select <include refid="Base_Column_List_show" />
+        select <include refid="Base_Column_List_show" />,dictextstatus.DIC_TYPE_NAME as text_status_buss_show
         from SAR_BUSSIONESS_STAND
         left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
         left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0)
         left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
         left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
+        left join TS_DICTYPE dictextstatus ON ( dictextstatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandSort.dic_id IS NOT NULL and dictextstatus.valid_flag = 0)
         left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
         left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
         where SAR_BUSSIONESS_STAND.id = #{id}
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java
index 3f1560e4..e58f8e60 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java
@@ -340,8 +340,10 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
     @GetMapping("/getDicTypeListCode")
     //@RequiresPermissions("sys:dicType:getDicTypeListCode")
     public ResponseMessage<Map<String, Object>> getDicTypeListCode() throws Exception {
-        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
-        return Result.success(dicTypeEO);
+
+        return Result.success("1","hello");
+//        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
+//        return Result.success(dicTypeEO);
     }
 
     /**

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 3/5] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=87=86=E5=A4=87?=
 =?UTF-8?q?=E7=9A=84=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>

From d86f1c12cda279afa48fa916b8f677da697a8b5f Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 20 Jan 2022 16:21:09 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandProjectLibrary/SarStandProjectLibraryMapper.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 1fa348f5..7350546f 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
@@ -370,7 +370,7 @@
     </select>
     <select id="queryProjectGroup"
             resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
-        select distinct sar_stand_project_library.project_group from sar_stand_project_library
+        select distinct sar_stand_project_library.project_group,sar_stand_project_library.management_host_name,sar_stand_project_library.category_name,sar_stand_project_library.development_host_name from sar_stand_project_library
         where 1=1
         <if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
           and  sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}

From eb15c06699bef7b484101c40cc23c1913aa1ed7b Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 20 Jan 2022 17:19:52 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customWorkGroup/controller/WorkGroupController.java     | 2 +-
 .../customWorkGroup/service/impl/WorkGroupServiceImpl.java  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
index 7685ce67..a138ed68 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
@@ -57,7 +57,7 @@ public class WorkGroupController extends BaseController<WorkGroup> {
 
 
 
-    @ApiModelProperty("删除工作组")
+    @ApiModelProperty("批量删除工作组")
     @DeleteMapping
     public ResponseMessage deleteWorkGroup(String id){
         boolean delete = iWorkGroupService.delete(id);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java
index ae37be0d..297b092a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java
@@ -12,6 +12,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -36,7 +39,8 @@ public class WorkGroupServiceImpl extends ServiceImpl<WorkGroupDao, WorkGroup> i
 
     @Override
     public boolean delete(String workGroupId) {
-        return this.removeById(workGroupId);
+        List<String> idList = Arrays.asList(workGroupId.split(","));
+        return this.removeByIds(idList);
     }
 
     @Override