修改业务端用户列表

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<Integer>().error("用户信息有误，请重新登陆");
+            }
             fromDto.setGridIdList(user.getDeptIdList());
         }
         return userFeignClient.getUnauthorizedAmount(fromDto);

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<UserDao, UserEntity> 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);