修改查询节点负责人信息接口

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;
 }

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) {
+    public Result<PowerAxisSLeaderResultDTO> getLeaderDetail(@PathVariable String axisStructId) {
-        PowerAxisSLeaderResultDTO dto = powerAxisStructLeaderService.queryLeaderDetailById(axisStructId);
+        return new Result().ok(powerAxisStructLeaderService.queryLeaderDetailById(axisStructId));
-        return new Result().ok(dto);
     }
 
     /**

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 baseDao.queryLeaderDetailById(axisStructId);
-        return dto;
     }
 
 }

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