From bbc55babed054d4227e4387d271fc3c0c77ee9d8 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Thu, 21 Apr 2022 18:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E8=B4=9F=E8=B4=A3=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../power/dto/axis/result/PowerAxisSLeaderResultDTO.java     | 2 ++
 .../modules/axis/controller/PowerAxisLeaderController.java   | 5 ++---
 .../axis/service/impl/PowerAxisStructLeaderServiceImpl.java  | 3 +--
 .../resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml  | 4 +++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSLeaderResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSLeaderResultDTO.java
index fe677d4..5107e24 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSLeaderResultDTO.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisSLeaderResultDTO.java
@@ -5,8 +5,10 @@ import lombok.Data;
 @Data
 public class PowerAxisSLeaderResultDTO {
     private String name;
+    private String categoryCode;
     private String gender;
     private String mobile;
     private String interoduction;
     private String avatar;
+    private String id;
 }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisLeaderController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisLeaderController.java
index 3a20c8a..1e4b79d 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisLeaderController.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisLeaderController.java
@@ -96,9 +96,8 @@ public class PowerAxisLeaderController {
      * 查询节点负责人信息
      */
     @PostMapping("/getLeaderDetail/{axisStructId}")
-    public Result getLeaderDetail(@PathVariable String axisStructId) {
-        PowerAxisSLeaderResultDTO dto = powerAxisStructLeaderService.queryLeaderDetailById(axisStructId);
-        return new Result().ok(dto);
+    public Result<PowerAxisSLeaderResultDTO> getLeaderDetail(@PathVariable String axisStructId) {
+        return new Result().ok(powerAxisStructLeaderService.queryLeaderDetailById(axisStructId));
     }
 
     /**
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java
index 61d6f2c..84d8cd8 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java
@@ -85,8 +85,7 @@ public class PowerAxisStructLeaderServiceImpl extends BaseServiceImpl<PowerAxisS
 
     @Override
     public PowerAxisSLeaderResultDTO queryLeaderDetailById(String axisStructId) {
-        PowerAxisSLeaderResultDTO dto = baseDao.queryLeaderDetailById(axisStructId);
-        return dto;
+        return baseDao.queryLeaderDetailById(axisStructId);
     }
 
 }
\ No newline at end of file
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 f557fb2..785a627 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
@@ -27,7 +27,9 @@
             GENDER,
             MOBILE,
             INTERODUCTION,
-            AVATAR
+            CATEGORY_CODE,
+            AVATAR,
+            ID
         FROM
             pli_power_axis_struct_leader
 	    LEFT JOIN