From a6da5656337b7ae70b8f86f85ce404c221901a12 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Fri, 22 Apr 2022 10:04:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../poweraxis/PowerAxisStructLeaderDao.xml    | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml
index 110a532..44c7a36 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml
@@ -19,20 +19,18 @@
     <select id="queryLeaderDetailById"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO">
         SELECT
-            NAME,
-            GENDER,
-            MOBILE,
-            INTERODUCTION,
-            CATEGORY_CODE,
-            AVATAR,
-            ID
+            l.NAME,
+            l.GENDER,
+            l.MOBILE,
+            l.INTERODUCTION,
+            sl.CATEGORY_CODE,
+            l.AVATAR,
+            l.ID
         FROM
-            pli_power_axis_leader
-
-	    LEFT JOIN
-	        pli_power_axis_struct_leader
-	    ON
-	        STRUCT_REFERENCE_ID = #{axisStructId}
+            pli_power_axis_leader l
+	    LEFT JOIN pli_power_axis_struct_leader sl ON sl.LEADER_ID = l.ID
+	    WHERE sl.STRUCT_REFERENCE_ID = #{axisStructId}
+	    AND sl.DEL_FLAG = '0' AND l.DEL_FLAG = '0'
     </select>