From b70395f56b92e648b7d1f3c162fb9091494bf881 Mon Sep 17 00:00:00 2001
From: jiang <jiang@bonus>
Date: Wed, 20 Nov 2024 16:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/ai/controller/DataSetLabelsController.java   |  7 ++++++-
 .../com/bonus/ai/service/DataSetLabelsService.java     |  1 +
 .../ai/service/Impl/DataSetLabelsServiceImpl.java      | 10 +++++++++-
 .../main/resources/mapper/DataSetTeamMemberMapper.xml  |  4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetLabelsController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetLabelsController.java
index 5f57096..ee3dad2 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetLabelsController.java
+++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetLabelsController.java
@@ -82,7 +82,7 @@ public class DataSetLabelsController extends BaseController
      * 修改样本标签管理
      */
     @RequiresPermissions("dataCenter:dataSetLabels:edit")
-    @PutMapping("/update")
+    @PostMapping("/update")
     @SysLog(title = "样本标签管理", businessType = OperaType.UPDATE,logType = 0,module = "样本标签管理",details = "导出样本标签管理列表")
     public AjaxResult edit(@RequestBody DataSetLabels dataSetLabels)
     {
@@ -99,4 +99,9 @@ public class DataSetLabelsController extends BaseController
     {
         return dataSetLabelsService.deleteDataSetLabelsByLabelIds(labelIds);
     }
+
+    @PostMapping("/getLabelsTree/{labelId}")
+    public AjaxResult getLabelsTree(@PathVariable Long labelId){
+        return dataSetLabelsService.getLabelsTree(labelId);
+    }
 }
diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/DataSetLabelsService.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/DataSetLabelsService.java
index 59ed185..b0e055a 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/DataSetLabelsService.java
+++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/DataSetLabelsService.java
@@ -52,4 +52,5 @@ public interface DataSetLabelsService
      */
     public AjaxResult deleteDataSetLabelsByLabelIds(Long[] labelIds);
 
+    AjaxResult getLabelsTree(Long labelId);
 }
diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetLabelsServiceImpl.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetLabelsServiceImpl.java
index f0f1594..26cf852 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetLabelsServiceImpl.java
+++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetLabelsServiceImpl.java
@@ -38,7 +38,7 @@ public class DataSetLabelsServiceImpl implements DataSetLabelsService
             if (ObjectUtils.isEmpty(dataSetLabels)) {
                 return AjaxResult.error();
             }else {
-                return AjaxResult.success();
+                return AjaxResult.success(dataSetLabels);
             }
         }catch (Exception e){
             return AjaxResult.error();
@@ -112,4 +112,12 @@ public class DataSetLabelsServiceImpl implements DataSetLabelsService
         }
     }
 
+    @Override
+    public AjaxResult getLabelsTree(Long labelId) {
+        DataSetLabels entity = new DataSetLabels();
+        List<DataSetLabels> dataSetLabels = dataSetLabelsMapper.selectDataSetLabelsList(entity);
+        dataSetLabels.removeIf(item -> item.getLabelId().equals(labelId));
+        return AjaxResult.success(dataSetLabels);
+    }
+
 }
diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetTeamMemberMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetTeamMemberMapper.xml
index 21513f5..740b92c 100644
--- a/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetTeamMemberMapper.xml
+++ b/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetTeamMemberMapper.xml
@@ -20,12 +20,12 @@
                AT.role_id AS roleId
         FROM
         ai_annotation_team_member AT
-	    LEFT JOIN sys_user su ON AT.member_id = su.user_id AND su.del_flag='0' AND at.del_flag='0'
+	    LEFT JOIN sys_user su ON AT.member_id = su.user_id AND su.del_flag='0'
     </sql>
     <select id="selectTeamMemberList" parameterType="com.bonus.ai.domain.DataSetTeamMemberEntity"  resultType="com.bonus.ai.domain.DataSetTeamMemberEntity">
         <include refid="selectTeamMemberVo"/>
         <where>
-            at.del_flag='0'
+            AT.del_flag='0'
             <if test="userName != null  and userName != ''"> and su.nick_name like concat('%', #{userName}, '%')</if>
             <if test="roleId != null  and roleId != ''"> and AT.role_id = #{roleId}</if>
             <if test="sex != null  and sex != ''"> and  su.sex = #{sex}</if>