From 717f5f82fa2d1ef4c0d6413efa7b3682d5ed6ffb Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 11 May 2022 15:51:51 +0800
Subject: [PATCH] =?UTF-8?q?message:=E4=BF=AE=E6=94=B9=E5=85=9A=E5=91=98?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=88=B7=E5=9D=90=E6=A0=87=E9=9B=86=E5=90=88?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../axis/form/PowerKernelListPostitionFormDTO.java    |  4 +++-
 .../modules/axis/dao/PowerKernelHouseholdDao.java     |  2 ++
 .../service/impl/PowerKernelHouseholdServiceImpl.java |  8 +++++++-
 .../mapper/poweraxis/PowerKernelHouseholdDao.xml      | 11 +++++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java
index 3468172..3486538 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java
@@ -13,7 +13,6 @@ public class PowerKernelListPostitionFormDTO implements Serializable {
     /**
      * 动力主轴id
      */
-    @NotBlank(message = "动力主轴节点不能为空")
     private String axisStructId;
 
     /**
@@ -26,4 +25,7 @@ public class PowerKernelListPostitionFormDTO implements Serializable {
      */
     @NotBlank(message = "所属客户不能为空")
     private String customerId;
+
+    @NotBlank(message = "所属组织不能为空")
+    private String agencyId;
 }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java
index 1509ff5..d77247e 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java
@@ -54,4 +54,6 @@ public interface PowerKernelHouseholdDao extends BaseDao<PowerKernelHouseholdEnt
 
     List<PowerKernelHouseholdDTO> getPage(Map<String, Object> params);
 
+    String queryAxisStructId(@Param("agencyId") String agencyId,
+                             @Param("customerId") String customerId);
 }
\ No newline at end of file
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java
index 198ead8..453bd88 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java
@@ -31,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -144,7 +145,12 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
         if (null == limit || NumConstant.ZERO_L == limit) {
             limit = 999;
         }
-        return baseDao.queryListPosition(form.getAxisStructId(), form.getCustomerId(), limit);
+        String axisStructId = form.getAxisStructId();
+        if (StringUtils.isBlank(axisStructId)) {
+            String agencyId = form.getAgencyId();
+            axisStructId = baseDao.queryAxisStructId(agencyId,form.getCustomerId());
+        }
+        return baseDao.queryListPosition(axisStructId, form.getCustomerId(), limit);
     }
 
     @Override
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml
index 39fa97e..de66e46 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml
@@ -171,6 +171,17 @@
         ORDER BY
 	        h.CREATED_TIME
     </select>
+    <select id="queryAxisStructId" resultType="java.lang.String">
+        SELECT
+            id
+        FROM
+            pli_power_axis_struct
+        WHERE
+            agency_id = #{agencyId}
+            AND DEL_FLAG = '0'
+            AND pid = '0'
+            AND CUSTOMER_ID = #{customerId}
+    </select>
 
 
 </mapper>
\ No newline at end of file