From 1192bea7a457ebf1844b95e586a7befbc223441a Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Thu, 11 Sep 2025 10:43:19 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=88=A0=E9=99=A4=E6=AD=BB=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/DeleteDeadLockController.java      |  7 ++---
 .../mapper/member/base/CuMemberMapper.xml     | 29 ++++++++-----------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java
index 85c3fd25..0b45ccc0 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java
@@ -9,10 +9,7 @@ import com.hzs.member.base.param.DeleteDeadLockParam;
 import com.hzs.member.base.service.DeleteDeadLockService;
 import com.hzs.member.base.vo.DeleteDeadLockVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -38,7 +35,7 @@ public class DeleteDeadLockController extends BaseController {
      * 删除死点
      */
     @PostMapping("delete")
-    public AjaxResult delete(DeleteDeadLockParam deleteDeadLockParam) {
+    public AjaxResult delete(@RequestBody DeleteDeadLockParam deleteDeadLockParam) {
         String check = deleteDeadLockService.deleteDeadLockMember(deleteDeadLockParam);
         if (check == null) {
             return AjaxResult.success();
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
index f6f4ab5d..3b08b904 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
@@ -3218,7 +3218,7 @@
         WHERE
             cu.DEL_FLAG = 0
             AND cu.CATEGORY = 2
-        <if test="memberCode != null">
+        <if test="memberCode != null and memberCode != ''">
             AND cu.MEMBER_CODE = #{memberCode}
         </if>
     </select>
@@ -3230,23 +3230,18 @@
                 SELECT
                     MEMBER_CODE
                 FROM
-                    (
-                        SELECT
-                            MEMBER_CODE
-                        FROM
-                            CU_MEMBER START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PARENT
-                                                                                    AND MEMBER_CODE = #{memberCode}
-                                                                                    AND DEL_FLAG = 0 UNION
-                        SELECT
-                            MEMBER_CODE
-                        FROM
-                            CU_MEMBER START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PLACE_PARENT
-                                                                                    AND MEMBER_CODE = #{memberCode}
-                                                                                    AND DEL_FLAG = 0
-                    ) t
+                    CU_MEMBER
                 WHERE
-                    t.MEMBER_CODE != #{memberCode}
-            )
+                    DEL_FLAG = 0 START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PARENT UNION ALL
+                SELECT
+                    MEMBER_CODE
+                FROM
+                    CU_MEMBER
+                WHERE
+                    DEL_FLAG = 0 START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PLACE_PARENT
+            ) t
+        WHERE
+            t.MEMBER_CODE != #{memberCode}
     </select>