From ef991e8e2743ca4fc6075c7d8825e15f76033533 Mon Sep 17 00:00:00 2001 From: yujintao Date: Tue, 17 Dec 2019 10:26:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95=E5=87=BA?= =?UTF-8?q?=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/dao/SysDeptDao.java | 12 +++++------- .../esua/epdc/service/impl/SysDeptServiceImpl.java | 11 +++++------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java index 7e3cb8b96..d36c03a08 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java @@ -119,7 +119,7 @@ public interface SysDeptDao extends BaseDao { List selectListHeadDeptNode(@Param("dataScopeDeptList") List dataScopeDeptList); /** - * s + * 通过数据权限和上级机构列表查询下级机构id列表 * * @param dataScopeDeptList * @param parentDeptIdList @@ -136,15 +136,13 @@ public interface SysDeptDao extends BaseDao { * @Description * @Date 2019/12/4 20:22 **/ - List selectListUserSysDeptInfo(UserSysDeptInfoFormDTO formDTO); - - + List selectListUserSysDeptInfo(UserSysDeptInfoFormDTO formDTO); /** - * @author: qushutong - * @Date: 2019/12/13 14:17 - * @Description: 查询所有 + * @author: qushutong + * @Date: 2019/12/13 14:17 + * @Description: 查询所有 */ List selectListDeptTree(); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 860c58995..08463940a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -423,7 +423,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl cache = Lists.newArrayList(); Map object; - while (CollUtil.isNotEmpty(dataScopeDeptList)) { + while (CollUtil.isNotEmpty(dataScopeDeptList) && CollUtil.isNotEmpty(parentDeptIdList)) { // 通过上级节点组装所有下级节点 object = this.packageChildrenNodeArray(parentNodeArray, dataScopeDeptList, parentDeptIdList); @@ -446,7 +446,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl + * @return java.util.Map * @author work@yujt.net.cn * @date 2019/11/29 10:27 */ @@ -561,7 +561,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl getOtherDept(List deptList, JSONArray parent) { List already = Lists.newArrayList(); for (int i = 0; i < parent.size(); i++) { @@ -579,10 +578,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl * @author qushutong * @date 2019/12/13 14:50 From 6f292d1121f3f36bf3dff3039f026bb7f5156b73 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 17 Dec 2019 12:31:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/GroupFeignClient.java | 3 ++- .../epdc/service/impl/AppUserServiceImpl.java | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java index 508a64951..6769a96c3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java @@ -12,6 +12,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -215,5 +216,5 @@ public interface GroupFeignClient { * @since 2019/11/21 10:35 */ @PostMapping(value = "group/epdc-app/group/joinPartyGroup", consumes = MediaType.APPLICATION_JSON_VALUE) - Result joinGridPartyGroup(GroupUserFormDTO formDto); + Result joinGridPartyGroup(@RequestBody GroupUserFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index b756b7cd0..14bbc1539 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -30,6 +30,7 @@ import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO; import com.elink.esua.epdc.enums.*; import com.elink.esua.epdc.feign.AdminFeignClient; +import com.elink.esua.epdc.feign.GroupFeignClient; import com.elink.esua.epdc.feign.OssFeignClient; import com.elink.esua.epdc.feign.UserFeignClient; import com.elink.esua.epdc.jwt.JwtTokenProperties; @@ -95,6 +96,9 @@ public class AppUserServiceImpl implements AppUserService { @Autowired private GroupTask groupTask; + @Autowired + private GroupFeignClient groupFeignClient; + //private static String USER_FACE = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_user_face.png"; private static String USER_FACE = "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png"; @@ -295,7 +299,7 @@ public class AppUserServiceImpl implements AppUserService { EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(tokenDto, newAppUser.getGrid(), AppUserStatesEnum.STATE_REGISTERED.value()); // 网格长加入网格党员群并设置为群主 - this.joinGridPartyGroup(newAppUser, NumConstant.ONE_STR); + this.joinGridPartyGroup(newAppUser, newAppUser.getGridId(), NumConstant.ONE_STR); return new Result().ok(authorization); } @@ -723,7 +727,7 @@ public class AppUserServiceImpl implements AppUserService { registeredUser = userResult.getUserDTO(); // 用户已认证为党员，绑定网格时加入该网格党员群 if (NumConstant.ONE_STR.equals(registeredUser.getPartyFlag())) { - this.joinGridPartyGroup(registeredUser, NumConstant.ZERO_STR); + this.joinGridPartyGroup(registeredUser, userResult.getGridId(), NumConstant.ZERO_STR); } } @@ -830,7 +834,8 @@ public class AppUserServiceImpl implements AppUserService { formDto.setDeptId(user.getGridId()); formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); - groupTask.updateUserPartyMember(formDto); + groupFeignClient.updateUserPartyMember(formDto); +// groupTask.updateUserPartyMember(formDto); } return new Result().ok(authorizationDto); @@ -1005,7 +1010,7 @@ public class AppUserServiceImpl implements AppUserService { * @author liuchuang * @since 2019/11/21 10:58 */ - private void joinGridPartyGroup(UserDTO userDto, String lordFlag) { + private void joinGridPartyGroup(UserDTO userDto, Long gridId, String lordFlag) { GroupUserFormDTO formDto = new GroupUserFormDTO(); formDto.setUserId(userDto.getId()); formDto.setNickname(userDto.getNickname()); @@ -1014,8 +1019,9 @@ public class AppUserServiceImpl implements AppUserService { formDto.setPartyMember(userDto.getPartyFlag()); formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); formDto.setLordFlag(lordFlag); - formDto.setGridId(userDto.getGridId()); - groupTask.joinGridPartyGroup(formDto); + formDto.setGridId(gridId); + groupFeignClient.joinGridPartyGroup(formDto); +// groupTask.joinGridPartyGroup(formDto); } @Override From 139f58e5553782930da98657769bb9a999d44e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 17 Dec 2019 13:26:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=96=B0=E5=A2=9Ebug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/controller/SysDeptController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 030e93db4..9055e761e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -204,7 +204,7 @@ public class SysDeptController { * @author qushutong * @date 2019/12/13 15:25 */ - @GetMapping("getDeptTree") + @GetMapping("party/getDeptTree") public Result getDeptTree(){ return sysDeptService.getDeptTree(); }