From 35f16bcbcfcb0daba98ec8d230869a76b136e421 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Thu, 21 Apr 2022 13:29:45 +0800
Subject: [PATCH] =?UTF-8?q?message:=20=E6=A0=B9=E6=8D=AEagencyId=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/power/dto/axis/form/PowerAxisStructFormDTO.java   | 1 +
 .../main/resources/mapper/poweraxis/PowerAxisStructDao.xml   | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructFormDTO.java
index f75dff7..67e2e62 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructFormDTO.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructFormDTO.java
@@ -8,5 +8,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class PowerAxisStructFormDTO{
+    private String agencyId;
     private String name;
 }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml
index ab50bea..2401f5a 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml
@@ -78,7 +78,10 @@
             <if test="name != null and name != ''">
                 and NAME = #{name}
             </if>
-	         and del_flag = 0
+            <if test="agencyId != null and agencyId != ''">
+                and AGENCY_ID = #{agencyId}
+            </if>
+	            and del_flag = 0
         </where>
     </select>
     <select id="queryList" resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisStructListResultDTO">