Merge branch 'dev_power_axis' into dev

3 years ago · 1aca04c358
1 changed files with 3 additions and 3 deletions
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml
@ -50,16 +50,16 @@
        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>