From 44393c738869368960c80c67f10c8cf6e55fe20e Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 20 Nov 2019 17:30:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/elink/esua/epdc/dto/UserDTO.java | 2 ++ .../java/com/elink/esua/epdc/service/impl/UserServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java index 8098596e4..b62e3d764 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java @@ -313,4 +313,6 @@ public class UserDTO implements Serializable { */ private String myGridName; + private String leaderFlag; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 890f4680e..121df8695 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -497,6 +497,8 @@ public class UserServiceImpl extends BaseServiceImpl implem throw new RenException("保存用户信息异常"); } + UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), userGridRelation.getGridId()); + userDto.setLeaderFlag(relationInfo.getLeaderFlag()); return new Result().ok(userDto); }