From 4b5bfd321502b54fa5afbacabf7495a91e15c0f9 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Thu, 5 Dec 2019 13:52:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E7=AB=AF?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/WorkUserServiceImpl.java | 5 +++++ .../com/elink/esua/epdc/service/impl/UserServiceImpl.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index b4993e92f..5117b41fa 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java @@ -155,6 +155,11 @@ public class WorkUserServiceImpl implements WorkUserService { if (CollUtil.isEmpty(deptIdList)) { return new Result().error("获取用户部门权限失败"); } + if(deptIdList != null && deptIdList.size() > 0){ + fromDto.setGridIdList(user.getDeptIdList()); + }else { + return new Result().error("用户信息有误，请重新登陆"); + } fromDto.setGridIdList(user.getDeptIdList()); } return userFeignClient.getUnauthorizedAmount(fromDto); 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 d7746b855..f9b80d176 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 @@ -646,11 +646,11 @@ public class UserServiceImpl extends BaseServiceImpl implem // 查询认证成的居民或党员 String state = AppUserStatesEnum.STATE_INFORMATION_PASSED.value(); // 查询待认证的居民 - if (YesOrNoEnum.NO.value().equals(partyFlag) && YesOrNoEnum.NO.equals(authenticatedFlag)) { + if (YesOrNoEnum.NO.value().equals(partyFlag) && YesOrNoEnum.NO.value().equals(authenticatedFlag)) { state = AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value(); } // 查询认证失败的党员 - if (YesOrNoEnum.YES.value().equals(partyFlag) && YesOrNoEnum.NO.equals(authenticatedFlag)) { + if (YesOrNoEnum.YES.value().equals(partyFlag) && YesOrNoEnum.NO.value().equals(authenticatedFlag)) { state = AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value(); } workUserFromDto.setAuthenticatedFlag(state);