Merge branch 'dev_power_axis'

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml

@@ -50,15 +50,17 @@
         LEFT JOIN
             pli_power_axis_struct AS poas
         ON
-            poas.id = #{axisStructId}
+            poas.id = #{axisStructId} and poas.DEL_FLAG = '0'
         LEFT JOIN
             pli_power_axis_tag AS ppat
         ON
-            poas.CATEGORY_CODE = ppat.CATEGORY_CODE
+            poas.CATEGORY_CODE = ppat.CATEGORY_CODE and ppat.DEL_FLAG = '0'
         WHERE
 	        ppal.id = #{leaderId}
 	    AND
 	        ppal.customer_id = #{customerId}
+	    AND
+	        ppal.DEL_FLAG = '0'
     </select>